X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=7f2d61126fb5d86626a5058bfed78888ca6dd417;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=cdb4d9fe10b1b5340ae5ffd0129489fa33754553;hpb=0d5328b0076fcc2eb6489001d31127f318e8a176;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/common.h b/libhb/common.h
index cdb4d9fe..7f2d6112 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -478,7 +478,7 @@ struct hb_chapter_s
  * > format
  *     - format of the packets the subtitle decoder work-object sends to sub->fifo_raw
  *     - for passthru subtitles, is also the format of the final packets sent to sub->fifo_out
- *     - PICTURESUB for banded 8-bit YAUV pixels
+ *     - PICTURESUB for banded 8-bit YAUV pixels; see decvobsub.c documentation for more info
  *     - TEXTSUB for UTF-8 text marked up with <b>, <i>, or <u>
  *     - read by the muxers, and by the subtitle burn-in logic in the hb_sync_video work-object
  * > source
@@ -504,10 +504,16 @@ struct hb_subtitle_s
     hb_subtitle_config_t config;
 
     enum subtype { PICTURESUB, TEXTSUB } format;
-    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB } source;
+    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB, SSASUB } source;
     char lang[1024];
     char iso639_2[4];
     uint8_t type; /* Closed Caption, Childrens, Directors etc */
+    
+    // Color lookup table for VOB subtitle tracks. Each entry is in YCbCr format.
+    // Must be filled out by the demuxer for VOB subtitle tracks.
+    uint32_t    palette[16];
+    int         width;
+    int         height;
 
     int hits;     /* How many hits/occurrences of this subtitle */
     int forced_hits; /* How many forced hits in this subtitle */
@@ -577,8 +583,6 @@ struct hb_title_s
     const char  *container_name;
     int         data_rate;
 
-    uint32_t    palette[16];
-
     hb_metadata_t *metadata;
 
     hb_list_t * list_chapter;
@@ -726,6 +730,7 @@ extern hb_work_object_t hb_deccc608;
 extern hb_work_object_t hb_decsrtsub;
 extern hb_work_object_t hb_decutf8sub;
 extern hb_work_object_t hb_dectx3gsub;
+extern hb_work_object_t hb_decssasub;
 extern hb_work_object_t hb_render;
 extern hb_work_object_t hb_encavcodec;
 extern hb_work_object_t hb_encx264;
@@ -767,6 +772,13 @@ struct hb_filter_object_s
 #endif
 };
 
+#define HB_FILTER_DETELECINE    1
+#define HB_FILTER_DEINTERLACE   2
+#define HB_FILTER_DEBLOCK       3
+#define HB_FILTER_DENOISE       4
+#define HB_FILTER_DECOMB        5
+#define HB_FILTER_ROTATE        6
+
 extern hb_filter_object_t hb_filter_detelecine;
 extern hb_filter_object_t hb_filter_deinterlace;
 extern hb_filter_object_t hb_filter_deblock;
@@ -780,4 +792,7 @@ extern void hb_register_error_handler( hb_error_handler_t * handler );
 
 char * hb_strdup_printf( char * fmt, ... );
 
+int hb_yuv2rgb(int yuv);
+int hb_rgb2yuv(int rgb);
+
 #endif