Added "--subtitle-force" option to the CLI, and added changes to decsub to

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

diff --git a/libhb/common.h b/libhb/common.h
index 116f99a..22591c6 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -28,6 +28,8 @@
 #define EVEN( a )        ( (a) + ( (a) & 1 ) )
 #define MULTIPLE_16( a ) ( 16 * ( ( (a) + 8 ) / 16 ) )
 
+#define HB_DVD_READ_BUFFER_SIZE 2048
+
 typedef struct hb_handle_s hb_handle_t;
 typedef struct hb_list_s hb_list_t;
 typedef struct hb_rate_s hb_rate_t;
@@ -41,6 +43,8 @@ typedef struct hb_state_s hb_state_t;
 typedef union  hb_esconfig_u     hb_esconfig_t;
 typedef struct hb_work_private_s hb_work_private_t;
 typedef struct hb_work_object_s  hb_work_object_t;
+typedef struct hb_filter_private_s hb_filter_private_t;
+typedef struct hb_filter_object_s  hb_filter_object_t;
 typedef struct hb_buffer_s hb_buffer_t;
 typedef struct hb_fifo_s hb_fifo_t;
 typedef struct hb_lock_s hb_lock_t;
@@ -124,6 +128,7 @@ struct hb_job_s
 
     int             crop[4];
     int             deinterlace;
+    hb_list_t     * filters;
     int             width;
     int             height;
     int             keep_ratio;
@@ -142,10 +147,10 @@ struct hb_job_s
          vbitrate:          output bitrate (kbps)
          pass:              0, 1 or 2
          vrate, vrate_base: output framerate is vrate / vrate_base
-                h264_level:            boolean for whether or not we're encoding for iPod
-                crf:                           boolean for whether to use constant rate factor with x264
-                x264opts:                      string of extra x264 options 
-                areBframes:            boolean to note if b-frames are included in x264opts */
+         h264_level:        boolean for whether or not we're encoding for iPod
+         crf:               boolean for whether to use constant rate factor with x264
+         x264opts:          string of extra x264 options 
+         areBframes:        boolean to note if b-frames are included in x264opts */
 #define HB_VCODEC_MASK   0x0000FF
 #define HB_VCODEC_FFMPEG 0x000001
 #define HB_VCODEC_XVID   0x000002
@@ -158,15 +163,15 @@ struct hb_job_s
     int             vrate_base;
     int             pass;
     int             h264_13;
-       int                             h264_level;
-       int                             crf;
-       char                *x264opts;
-       int                             areBframes;
-       
+    int             h264_level;
+    int             crf;
+    char            *x264opts;
+    int             areBframes;
+    
     /* Audio tracks:
          audios:          Indexes in hb_title_t's audios list, starting from 0.
                           -1 indicates the end of the list
-            audio_mixdowns:  The mixdown to be used for each audio track in audios[] */
+        audio_mixdowns:  The mixdown to be used for each audio track in audios[] */
 
 /* define some masks, used to extract the various information from the HB_AMIXDOWN_XXXX values */
 #define HB_AMIXDOWN_DCA_FORMAT_MASK             0x00FFF000
@@ -241,12 +246,18 @@ struct hb_job_s
 #define HB_MUX_AVI  0x040000
 #define HB_MUX_OGM  0x080000
 #define HB_MUX_IPOD 0x100000
+#define HB_MUX_MKV  0x200000
        
     int             mux;
     const char          * file;
 
+    /* Allow MP4 files > 4 gigs */
+    int             largeFileSize;
+    
+
     int subtitle_scan;
     hb_subtitle_t ** select_subtitle;
+    int subtitle_force;
     char * native_language;
 
 #ifdef __LIBHB__
@@ -334,6 +345,8 @@ struct hb_audio_s
        /* amixdown is the mixdown format to be used for this audio track */
        int amixdown;
 
+       /* Source PID is only valid for MPEG Transport Streams */
+       int source_pid;
 #endif
 };
 
@@ -507,4 +520,33 @@ extern hb_work_object_t hb_encfaac;
 extern hb_work_object_t hb_enclame;
 extern hb_work_object_t hb_encvorbis;
 
+#define FILTER_OK      0
+#define FILTER_DELAY   1
+#define FILTER_FAILED  2
+#define FILTER_DROP    3
+
+struct hb_filter_object_s
+{
+    int                     id;
+    char                  * name;
+    char                  * settings;
+
+#ifdef __LIBHB__
+    hb_filter_private_t* (* init)  ( int, int, int, char * );
+    
+    int                  (* work)  ( const hb_buffer_t *, hb_buffer_t **,
+                                     int, int, int, hb_filter_private_t * );
+    
+    void                 (* close) ( hb_filter_private_t * );
+    
+    hb_filter_private_t   * private_data;
+    //hb_buffer_t           * buffer;
+#endif
+};
+
+extern hb_filter_object_t hb_filter_detelecine;
+extern hb_filter_object_t hb_filter_deinterlace;
+extern hb_filter_object_t hb_filter_deblock;
+extern hb_filter_object_t hb_filter_denoise;
+
 #endif