Support for reading VOB subtitle tracks from file inputs initital implementation.

- Patch by davidfstr, Nice Work!
- Adds support for reading VOB subtitle tracks from file inputs.
Tested with:
- MKV VOB -> MKV VOB passthru.
- MKV VOB -> MKV VOB burned in.
VOB subtitle palette moved from per-title to per-track.
Discussion leading up to commit can be referenced here: http://forum.handbrake.fr/viewtopic.php?f=4&t=16267

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3308 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 8 insertions, 3 deletions

diff --git a/libhb/common.h b/libhb/common.h
index cdb4d9fe1..e70550eb8 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
@@ -508,6 +508,10 @@ struct hb_subtitle_s
     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 */
@@ -577,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;
@@ -780,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