Adds two new parameters to hb_scan, to control the number of preview frames generated...

[handbrake-jp/handbrake-jp-git.git] / libhb / common.h

diff --git a/libhb/common.h b/libhb/common.h
index a5cfcf4..2a12e8f 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -27,7 +27,7 @@
 
 #define EVEN( a )        ( (a) + ( (a) & 1 ) )
 #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) )
-#define MULTIPLE_MOD( a, b ) ( b * ( ( (a) + (b / 2) ) / b ) )
+#define MULTIPLE_MOD( a, b ) ( b * ( ( (a) + (b / 2) - 1) / b ) )
 
 #define HB_DVD_READ_BUFFER_SIZE 2048
 
@@ -187,6 +187,7 @@ struct hb_job_s
     int             crf;
     char            *x264opts;
     int             areBframes;
+    int             color_matrix;
 
     /* List of audio settings. */
     hb_list_t     * list_audio;
@@ -221,6 +222,15 @@ struct hb_job_s
     int subtitle_force;
     char * native_language;
 
+    int64_t         pts_to_stop;        // declare eof when we pass this pts in
+                                        //  the time-linearized input stream
+    int             start_at_preview;   // if non-zero, encoding will start
+                                        //  at the position of preview n
+    int             seek_points;        //  out of N previews
+    uint32_t        frames_to_skip;     // decode but discard this many frames
+                                        //  initially (for frame accurate positioning
+                                        //  to non-I frames).
+
 #ifdef __LIBHB__
     /* Internal data */
     hb_handle_t   * h;
@@ -329,6 +339,7 @@ struct hb_audio_config_s
             int bitrate;    /* Output bitrate (kbps) */
             int mixdown;    /* The mixdown format to be used for this audio track (see HB_AMIXDOWN_*) */
             double dynamic_range_compression; /* Amount of DRC that gets applied to this track */
+            char * name;    /* Output track name */
     } out;
 
     /* Input */
@@ -337,6 +348,8 @@ struct hb_audio_config_s
         int track;                /* Input track number */
         PRIVATE uint32_t codec;   /* Input audio codec */
         PRIVATE uint32_t codec_param; /* per-codec config info */
+        PRIVATE uint32_t version; /* Bitsream version */
+        PRIVATE uint32_t mode;    /* Bitstream mode, codec dependent encoding */
         PRIVATE int samplerate; /* Input sample rate (Hz) */
         PRIVATE int bitrate;    /* Input bitrate (kbps) */
         PRIVATE int channel_layout;
@@ -358,6 +371,7 @@ struct hb_audio_config_s
         PRIVATE char description[1024];
         PRIVATE char simple[1024];
         PRIVATE char iso639_2[4];
+        PRIVATE uint8_t type; /* normal, visually impared, directors */
     } lang;
 };
 
@@ -406,6 +420,7 @@ struct hb_subtitle_s
     int  id;
     char lang[1024];
     char iso639_2[4];
+    uint8_t type; /* Closed Caption, Childrens, Directors etc */
 
     int hits;     /* How many hits/occurrences of this subtitle */
     int forced_hits; /* How many forced hits in this subtitle */
@@ -447,7 +462,7 @@ struct hb_title_s
     int         rate;
     int         rate_base;
     int         crop[4];
-    enum { HB_MPEG2_DEMUXER = 0, HB_NULL_DEMUXER } demuxer;
+    enum { HB_MPEG2_PS_DEMUXER = 0, HB_MPEG2_TS_DEMUXER, HB_NULL_DEMUXER } demuxer;
     int         detected_interlacing;
     int         video_id;               /* demuxer stream id for video */
     int         video_codec;            /* worker object id of video codec */
@@ -530,6 +545,8 @@ typedef struct hb_work_info_s
     int     rate;
     int     rate_base;
     int     flags;
+    int     version;
+    int     mode;
     union {
         struct {    // info only valid for video decoders
             int     width;