X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fcommon.h;h=e70550eb8ec261fac2ec9c9ce25ed98def90f474;hb=93b82f5fb7457e2e07dcf88e8d23e1739a9b0afe;hp=0c06ba967faaf1c3a2869b0aed729d15e417a97a;hpb=7e083011cd7ddde540f88d725efbc951c822fb9b;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/common.h b/libhb/common.h
index 0c06ba96..e70550eb 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -125,6 +125,8 @@ struct hb_subtitle_config_s
     enum subdest { RENDERSUB, PASSTHRUSUB } dest;
     int  force;
     int  default_track; 
+    
+    /* SRT subtitle tracks only */
     char src_filename[128];
     char src_codeset[40];
     int64_t offset;
@@ -155,6 +157,7 @@ struct hb_job_s
 
     /* Pointer to the title to be ripped */
     hb_title_t    * title;
+    int             feature; // Detected DVD feature title
 
     /* Chapter selection */
     int             chapter_start;
@@ -361,6 +364,7 @@ struct hb_job_s
 #define HB_INPUT_CH_LAYOUT_2F2R    0x0722022
 #define HB_INPUT_CH_LAYOUT_3F2R    0x0832032
 #define HB_INPUT_CH_LAYOUT_4F2R    0x0942042
+#define HB_INPUT_CH_LAYOUT_3F4R    0x0a34034
 #define HB_INPUT_CH_LAYOUT_HAS_LFE 0x0000100
 /* define some macros to extract the various information from the HB_AMIXDOWN_XXXX values */
 #define HB_INPUT_CH_LAYOUT_GET_DISCRETE_FRONT_COUNT( a ) ( ( a & HB_INPUT_CH_LAYOUT_DISCRETE_FRONT_MASK ) >> 16 )
@@ -435,6 +439,7 @@ struct hb_audio_s
 
         hb_esconfig_t config;
         hb_mux_data_t * mux_data;
+        hb_fifo_t     * scan_cache;
     } priv;
 };
 #endif
@@ -462,6 +467,35 @@ struct hb_chapter_s
     char     title[1024];
 };
 
+/*
+ * A subtitle track.
+ * 
+ * Required fields when a demuxer creates a subtitle track are:
+ * > id
+ *     - ID of this track
+ *     - must be unique for all tracks within a single job,
+ *       since it is used to look up the appropriate in-FIFO with GetFifoForId()
+ * > 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; 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
+ *     - used to create the appropriate subtitle decoder work-object in do_job()
+ * > config.dest
+ *     - whether to render the subtitle on the video track (RENDERSUB) or 
+ *       to pass it through its own subtitle track in the output container (PASSTHRUSUB)
+ *     - for legacy compatibility, all newly created VOBSUB tracks should default to RENDERSUB
+ *     - since only VOBSUBs are renderable (as of 2010-04-25), all other newly created
+ *       subtitle track types should default to PASSTHRUSUB
+ * > lang
+ *     - user-readable description of the subtitle track
+ *     - may correspond to the language of the track (see the 'iso639_2' field)
+ *     - may correspond to the type of track (see the 'type' field; ex: "Closed Captions")
+ * > iso639_2
+ *     - language code for the subtitle, or "und" if unknown
+ */
 struct hb_subtitle_s
 {
     int  id;
@@ -470,10 +504,14 @@ struct hb_subtitle_s
     hb_subtitle_config_t config;
 
     enum subtype { PICTURESUB, TEXTSUB } format;
-    enum subsource { VOBSUB, SRTSUB, CC608SUB, CC708SUB } source;
+    enum subsource { VOBSUB, SRTSUB, CC608SUB, /*unused*/CC708SUB, UTF8SUB, TX3GSUB } 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 hits;     /* How many hits/occurrences of this subtitle */
     int forced_hits; /* How many forced hits in this subtitle */
@@ -543,8 +581,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;
@@ -690,6 +726,8 @@ extern hb_work_object_t hb_decvobsub;
 extern hb_work_object_t hb_encvobsub;
 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_render;
 extern hb_work_object_t hb_encavcodec;
 extern hb_work_object_t hb_encx264;
@@ -744,4 +782,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