X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fwork.c;h=c1891a6838b53908a0c93a444209da203215d4c2;hb=55b0015a8c50106e553bc2f48336cc2a1c495459;hp=d2c8ac66b54dd6fb65dbf91227c02c03c8a0e1cf;hpb=0b26c6c2d4033989b2307b22c187715b2c0039fb;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/work.c b/libhb/work.c
index d2c8ac66..c1891a68 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -305,12 +305,27 @@ void hb_display_job_info( hb_job_t * job )
 
         if( subtitle )
         {
-            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 == CC608SUB ||
-                      subtitle->source == CC708SUB) ? "CC" : "SRT"),
-                    subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through");
+            if( subtitle->source == SRTSUB )
+            {
+                /* For SRT, print offset and charset too */
+                hb_log( " * subtitle track %i, %s (id %x) %s [%s] -> %s%s, offset: %"PRId64", charset: %s",
+                        subtitle->track, subtitle->lang, subtitle->id, "Text", "SRT", "Pass-Through",
+                        subtitle->config.default_track ? ", Default" : "",
+                        subtitle->config.offset, subtitle->config.src_codeset );
+            }
+            else
+            {
+                hb_log( " * subtitle track %i, %s (id %x) %s [%s] -> %s%s%s", subtitle->track, subtitle->lang, subtitle->id,
+                        subtitle->format == PICTURESUB ? "Picture" : "Text",
+                        subtitle->source == VOBSUB ? "VOBSUB" : 
+                        subtitle->source == CC608SUB || subtitle->source == CC708SUB ? "CC" : 
+                        subtitle->source == UTF8SUB ? "UTF-8" : 
+                        subtitle->source == TX3GSUB ? "TX3G" : 
+                        subtitle->source == SSASUB ? "SSA" : "Unknown",
+                        subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through",
+                        subtitle->config.force ? ", Forced Only" : "",
+                        subtitle->config.default_track ? ", Default" : "" );
+            }
         }
     }
 
@@ -566,16 +581,13 @@ static void do_job( hb_job_t * job, int cpu_count )
             // So if the encoder is lame we need the output to be stereo (or multichannel
             // matrixed into stereo like dpl). If the decoder is not AC3 or DCA the
             // encoder has to handle the input format since we can't do a mixdown.
-#define STEREO_ONLY(a) ( a->config.out.codec & HB_ACODEC_LAME )
-
             switch (audio->config.in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK)
             {
                 // stereo input or something not handled below
                 default:
                 case HB_INPUT_CH_LAYOUT_STEREO:
                     // mono gets mixed up to stereo & more than stereo gets mixed down
-                    if ( STEREO_ONLY( audio ) ||
-                         audio->config.out.mixdown > HB_AMIXDOWN_STEREO)
+                    if ( audio->config.out.mixdown > HB_AMIXDOWN_STEREO )
                     {
                         audio->config.out.mixdown = HB_AMIXDOWN_STEREO;
                     }
@@ -583,23 +595,15 @@ static void do_job( hb_job_t * job, int cpu_count )
 
                 // mono input
                 case HB_INPUT_CH_LAYOUT_MONO:
-                    if ( STEREO_ONLY( audio ) )
-                    {
-                        audio->config.out.mixdown = HB_AMIXDOWN_STEREO;
-                    }
-                    else
-                    {
-                        // everything else passes through
-                        audio->config.out.mixdown = HB_AMIXDOWN_MONO;
-                    }
+                    // everything else passes through
+                    audio->config.out.mixdown = HB_AMIXDOWN_MONO;
                     break;
 
                 // dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input
                 // the A52 flags don't allow for a way to distinguish between DPL1 and
                 // DPL2 on a DVD so we always assume a DPL1 source for A52_DOLBY.
                 case HB_INPUT_CH_LAYOUT_DOLBY:
-                    if ( STEREO_ONLY( audio ) ||
-                         audio->config.out.mixdown > HB_AMIXDOWN_DOLBY )
+                    if ( audio->config.out.mixdown > HB_AMIXDOWN_DOLBY )
                     {
                         audio->config.out.mixdown = HB_AMIXDOWN_DOLBY;
                     }
@@ -608,8 +612,7 @@ static void do_job( hb_job_t * job, int cpu_count )
                 // 4 channel discrete
                 case HB_INPUT_CH_LAYOUT_2F2R:
                 case HB_INPUT_CH_LAYOUT_3F1R:
-                    if ( STEREO_ONLY( audio ) ||
-                         audio->config.out.mixdown > HB_AMIXDOWN_DOLBY )
+                    if ( audio->config.out.mixdown > HB_AMIXDOWN_DOLBY )
                     {
                         audio->config.out.mixdown = HB_AMIXDOWN_DOLBY;
                     }
@@ -617,18 +620,7 @@ static void do_job( hb_job_t * job, int cpu_count )
 
                 // 5 or 6 channel discrete
                 case HB_INPUT_CH_LAYOUT_3F2R:
-                    if ( STEREO_ONLY( audio ) )
-                    {
-                        if ( audio->config.out.mixdown < HB_AMIXDOWN_STEREO )
-                        {
-                            audio->config.out.mixdown = HB_AMIXDOWN_STEREO;
-                        }
-                        else if ( audio->config.out.mixdown > HB_AMIXDOWN_DOLBYPLII )
-                        {
-                            audio->config.out.mixdown = HB_AMIXDOWN_DOLBYPLII;
-                        }
-                    }
-                    else if ( ! ( audio->config.in.channel_layout &
+                    if ( ! ( audio->config.in.channel_layout &
                                     HB_INPUT_CH_LAYOUT_HAS_LFE ) )
                     {
                         // we don't do 5 channel discrete so mixdown to DPLII
@@ -795,6 +787,30 @@ 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 )
+            {
+                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->source == SSASUB )
+            {
+                w = hb_get_work( WORK_DECSSASUB );
+                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