Universal Text Subtitle Support Initial Implementation

[handbrake-jp/handbrake-jp-git.git] / libhb / work.c

diff --git a/libhb/work.c b/libhb/work.c
index d2c8ac6..838e507 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -308,6 +308,8 @@ void hb_display_job_info( hb_job_t * job )
             hb_log( " * subtitle track %i, %s (id %x) %s [%s] -> %s ", subtitle->track, subtitle->lang, subtitle->id,
                     subtitle->format == PICTURESUB ? "Picture" : "Text",
                     subtitle->source == VOBSUB ? "VOBSUB" : 
+                    subtitle->source == UTF8SUB ? "UTF-8" : 
+                    subtitle->source == TX3GSUB ? "TX3G" : 
                     ((subtitle->source == CC608SUB ||
                       subtitle->source == CC708SUB) ? "CC" : "SRT"),
                     subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through");
@@ -795,6 +797,25 @@ static void do_job( hb_job_t * job, int cpu_count )
                 w->subtitle = subtitle;
                 hb_list_add( job->list_work, w );
             }
+            
+            if( !job->indepth_scan && subtitle->source == UTF8SUB )
+            {
+                w = hb_get_work( WORK_DECUTF8SUB );
+                w->fifo_in  = subtitle->fifo_in;
+                w->fifo_out = subtitle->fifo_raw;
+                hb_list_add( job->list_work, w );
+            }
+            
+            if( !job->indepth_scan && subtitle->source == TX3GSUB )
+            {
+                // TODO(davidfstr): For MP4 containers, an alternate work-object
+                //                  should be used that just passes the packets through,
+                //                  instead of downconverting to UTF-8 subtitles.
+                w = hb_get_work( WORK_DECTX3GSUB );
+                w->fifo_in  = subtitle->fifo_in;
+                w->fifo_out = subtitle->fifo_raw;
+                hb_list_add( job->list_work, w );
+            }
 
             if( !job->indepth_scan && 
                 subtitle->format == PICTURESUB