Moved --native-langauge processing from libhb to the CLI. Added --native-dub option to allow the user to request dubbing instead of subtitles when the audio does not match the users native language.

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

4 files changed, 174 insertions, 131 deletions

diff --git a/libhb/common.h b/libhb/common.h
index ccd065c15..488004f7a 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -248,7 +248,6 @@ struct hb_job_s
 
     int                     indepth_scan;
     hb_subtitle_config_t    select_subtitle_config;
-    char                  * native_language;
 
     int             angle;              // dvd angle to encode
     int             frame_to_stop;       // declare eof when we hit this frame
diff --git a/libhb/hb.c b/libhb/hb.c
index e554a4d2c..df04aea3e 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -1014,7 +1014,7 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
     title_copy->list_subtitle = hb_list_init();
 
     /*
-     * The following code is confusing, there are three ways in which
+     * The following code is confusing, there are two ways in which
      * we select subtitles and it depends on whether this is single or
      * two pass mode.
      *
@@ -1022,17 +1022,13 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
      * scans all subtitles of that language. The second pass does not
      * select any because they are set at the end of the first pass.
      *
-     * native_language may have a preferred language, in which case we
-     * may be switching the language we want for the subtitles in the
-     * first pass of a single pass, or the second pass of a two pass.
-     *
      * We may have manually selected a subtitle, in which case that is
      * selected in the first pass of a single pass, or the second of a
      * two pass.
      */
     memset( audio_lang, 0, sizeof( audio_lang ) );
 
-    if ( job->indepth_scan || job->native_language ) {
+    if ( job->indepth_scan ) {
 
         /*
          * Find the first audio language that is being encoded
@@ -1045,35 +1041,6 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
                 break;
             }
         }
-
-        /*
-         * In all cases switch the language if we need to to our native
-         * language.
-         */
-        if( job->native_language )
-        {
-            if( strncasecmp( job->native_language, audio_lang,
-                             sizeof( audio_lang ) ) != 0 )
-            {
-
-                if( job->pass != 2 )
-                {
-                    hb_log( "Enabled subtitles in native language '%s', audio is in '%s'",
-                            job->native_language, audio_lang);
-                }
-                /*
-                 * The main audio track is not in our native language, so switch
-                 * the subtitles to use our native language instead.
-                 */
-                strncpy( audio_lang, job->native_language, sizeof( audio_lang ) );
-            } else {
-                /*
-                 * native language is irrelevent, free it.
-                 */
-                free( job->native_language );
-                job->native_language = NULL;
-            }
-        }
     }
 
     /*
@@ -1098,14 +1065,6 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
                 subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
                 memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
                 hb_list_add( title_copy->list_subtitle, subtitle_copy );
-                if ( job->native_language ) {
-                    /*
-                     * With native language just select the
-                     * first match in our langiage, not all of
-                     * them. Subsequent ones are likely to be commentary
-                     */
-                    break;
-                }
             }
         }
     } else {
@@ -1113,46 +1072,17 @@ void hb_add( hb_handle_t * h, hb_job_t * job )
          * Not doing a subtitle scan in this pass, but maybe we are in the
          * first pass?
          */
-        if( job->pass != 1 && job->native_language )
+        if( job->pass != 1 )
         {
             /*
-             * We are not doing a subtitle scan but do want the
-             * native langauge subtitle selected, so select it
-             * for pass 0 or pass 2 of a two pass.
+             * Copy all of them from the input job, to the title_copy/job_copy.
              */
-            for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
-            {
-                subtitle = hb_list_item( title->list_subtitle, i );
-                if( strcmp( subtitle->iso639_2, audio_lang ) == 0 )
+            for(  i = 0; i < hb_list_count(job->list_subtitle); i++ ) {
+                if( ( subtitle = hb_list_item( job->list_subtitle, i ) ) )
                 {
-                    /*
-                     * Matched subtitle language with audio language, so
-                     * add this to our list to scan.
-                     */
                     subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
                     memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
                     hb_list_add( title_copy->list_subtitle, subtitle_copy );
-                    break;
-                }
-            }
-        } else {
-            /*
-             * Manually selected subtitles, in which case only
-             * bother adding them for pass 0 or pass 2 of a two
-             * pass.
-             */
-            if( job->pass != 1 )
-            {
-                /*
-                 * Copy all of them from the input job, to the title_copy/job_copy.
-                 */
-                for(  i = 0; i < hb_list_count(job->list_subtitle); i++ ) {
-                    if( ( subtitle = hb_list_item( job->list_subtitle, i ) ) )
-                    {
-                        subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
-                        memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
-                        hb_list_add( title_copy->list_subtitle, subtitle_copy );
-                    }
                 }
             }
         }
diff --git a/libhb/work.c b/libhb/work.c
index 55ce36fc0..486b8a305 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -1002,41 +1002,32 @@ cleanup:
             }
         }
 
-        if( job->native_language ) {
+        
+        if( subtitle_forced_id )
+        {
             /*
-             * We still have a native_language, so the audio and subtitles are
-             * different, so in this case it is a foreign film and we want to
-             * select the subtitle with the highest hits in our language.
+             * If there are any subtitle streams with forced subtitles
+             * then select it in preference to the lowest.
              */
-            subtitle_hit = subtitle_highest_id;
-            hb_log( "Found a native-language subtitle id 0x%x", subtitle_hit);
-        } else {
-            if( subtitle_forced_id )
-            {
-                /*
-                 * If there are any subtitle streams with forced subtitles
-                 * then select it in preference to the lowest.
-                 */
-                subtitle_hit = subtitle_forced_id;
-                hb_log("Found a subtitle candidate id 0x%x (contains forced subs)",
-                       subtitle_hit);
-            } else if( subtitle_lowest < subtitle_highest )
+            subtitle_hit = subtitle_forced_id;
+            hb_log("Found a subtitle candidate id 0x%x (contains forced subs)",
+                   subtitle_hit);
+        } else if( subtitle_lowest < subtitle_highest )
+        {
+            /*
+             * OK we have more than one, and the lowest is lower,
+             * but how much lower to qualify for turning it on by
+             * default?
+             *
+             * Let's say 10% as a default.
+             */
+            if( subtitle_lowest < ( subtitle_highest * 0.1 ) )
             {
-                /*
-                 * OK we have more than one, and the lowest is lower,
-                 * but how much lower to qualify for turning it on by
-                 * default?
-                 *
-                 * Let's say 10% as a default.
-                 */
-                if( subtitle_lowest < ( subtitle_highest * 0.1 ) )
-                {
-                    subtitle_hit = subtitle_lowest_id;
-                    hb_log( "Found a subtitle candidate id 0x%x",
-                            subtitle_hit );
-                } else {
-                    hb_log( "No candidate subtitle detected during subtitle-scan");
-                }
+                subtitle_hit = subtitle_lowest_id;
+                hb_log( "Found a subtitle candidate id 0x%x",
+                        subtitle_hit );
+            } else {
+                hb_log( "No candidate subtitle detected during subtitle-scan");
             }
         }
     }
diff --git a/test/test.c b/test/test.c
index 0e33a6020..3d665a7af 100644
--- a/test/test.c
+++ b/test/test.c
@@ -39,6 +39,7 @@ static char * format      = NULL;
 static int    titleindex  = 1;
 static int    longest_title = 0;
 static char * native_language = NULL;
+static int    native_dub  = 0;
 static int    twoPass     = 0;
 static int    deinterlace           = 0;
 static char * deinterlace_opt       = 0;
@@ -66,6 +67,7 @@ static char * acodecs     = NULL;
 static char * anames      = NULL;
 static int    default_acodec = HB_ACODEC_FAAC;
 static int    default_abitrate = 160;
+static int    audio_explicit = 0;
 static char ** subtracks   = NULL;
 static char ** subforce    = NULL;
 static char * subburn     = NULL;
@@ -368,7 +370,6 @@ static void ShowCommands()
 static void PrintTitleInfo( hb_title_t * title )
 {
     hb_chapter_t  * chapter;
-    hb_audio_config_t    * audio;
     hb_subtitle_t * subtitle;
     int i;
 
@@ -1319,8 +1320,58 @@ static int HandleEvents( hb_handle_t * h )
             }
 
             /* Parse audio tracks */
-            if( hb_list_count(audios) == 0 )
+            if( native_language && native_dub )
             {
+                if( hb_list_count( audios ) == 0 || !audio_explicit )
+                {
+                    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+                    {
+                        char audio_lang[4];
+                        int track = i;
+                        
+                        audio = hb_list_audio_config_item( title->list_audio, i );
+                        
+                        strncpy( audio_lang, audio->lang.iso639_2, sizeof( audio_lang ) );
+                        
+                        if( strncasecmp( native_language, audio_lang, 
+                                         sizeof( audio_lang ) ) == 0 &&
+                            audio->lang.type != 3 && // Directors 1
+                            audio->lang.type != 4)   // Directors 2
+                        {
+                            /*
+                             * Matched an audio to our native language - use it.
+                             * Replace any existing audio tracks that a preset may
+                             * have put here.
+                             */
+                            if( hb_list_count(audios) == 0) {
+                                audio = calloc(1, sizeof(*audio));
+                                hb_audio_config_init(audio);
+                                audio->in.track = track;
+                                audio->out.track = num_audio_tracks++;
+                                /* Add it to our audios */
+                                hb_list_add(audios, audio);
+                            } else {
+                                /*
+                                 * Update the track numbers on what is already in
+                                 * there.
+                                 */
+                                for( i=0; i < hb_list_count( audios ); i++ )
+                                {
+                                    audio = hb_list_item( audios, i );
+
+                                    audio->in.track = track;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                } else {
+                    fprintf( stderr, "Warning: Native language (dubbing) selection ignored since an audio track has already been selected\n");
+                }
+            }
+
+            if( hb_list_count(audios) == 0 )
+            {        
                 /* Create a new audio track with default settings */
                 audio = calloc(1, sizeof(*audio));
                 hb_audio_config_init(audio);
@@ -1677,6 +1728,8 @@ static int HandleEvents( hb_handle_t * h )
                             job->select_subtitle_config.force = force;
                             job->select_subtitle_config.default_track = def;
                             subtitle_scan = 1;
+                        } else {
+                            fprintf( stderr, "Warning: Subtitle Scan for MP4 requires the '--subtitle-burn' option to be selected\n");
                         }
                     }
                     else
@@ -1690,7 +1743,7 @@ static int HandleEvents( hb_handle_t * h )
                         subtitle = hb_list_item(title->list_subtitle, track);
                         if( subtitle == NULL ) 
                         {
-                            fprintf( stderr, "Could not find subtitle track %d, skipped\n", track );
+                            fprintf( stderr, "Warning: Could not find subtitle track %d, skipped\n", track+1 );
                             continue;
                         }
                         sub_config = subtitle->config;
@@ -1717,6 +1770,7 @@ static int HandleEvents( hb_handle_t * h )
                              subtitle->format == PICTURESUB)
                         {
                             // Skip any non-burned vobsubs when output is mp4
+                            fprintf( stderr, "Warning: Skipping subtitle track %d, can't pass-through VOBSUBs in an MP4 container,\nadd '--subtitle-burn %d' to the command line\n", track+1, track+1 );
                             continue;
                         }
                         else if ( burn && subtitle->format == PICTURESUB )
@@ -1724,11 +1778,11 @@ static int HandleEvents( hb_handle_t * h )
                             // Only allow one subtitle to be burned into video
                             if ( sub_burned )
                             {
+                                fprintf( stderr, "Warning: Skipping subtitle track %d, can't have more than one track burnt in\n", track+1 );
                                 continue;
                             }
                             sub_burned = 1;
                         }
-
                         sub_config.force = force;
                         sub_config.default_track = def;
                         hb_subtitle_add( job, &sub_config, track );
@@ -1738,17 +1792,77 @@ static int HandleEvents( hb_handle_t * h )
 
             if( native_language )
             {
-                job->native_language = strdup( native_language );
-                if ( subtracks == NULL )
+                char audio_lang[4];
+                
+                audio = hb_list_audio_config_item(job->list_audio, 0);
+                
+                if( audio ) 
                 {
-                    if ( subforce )
-                        job->select_subtitle_config.force = 1;
-
-                    if ( subburn == NULL && mux != HB_MUX_MP4 )
-                        job->select_subtitle_config.force = 1;
+                    strncpy( audio_lang, audio->lang.iso639_2, sizeof( audio_lang ) );
+                    
+                    if( strncasecmp( native_language, audio_lang, 
+                                     sizeof( audio_lang ) ) != 0 )
+                    {
+                        /*
+                         * Audio language is not the same as our native language. 
+                         * If we have any subtitles in our native language they
+                         * should be selected here if they haven't already been.
+                         */
+                        hb_subtitle_t *subtitle, *subtitle2 = NULL;
+                        int matched_track = 0;
 
-                    if ( subdefault )
-                        job->select_subtitle_config.default_track = 1;
+                        for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+                        {
+                            subtitle = hb_list_item( title->list_subtitle, i );
+                            matched_track = i;
+                            if( strcmp( subtitle->iso639_2, native_language ) == 0 )
+                            {  
+                                /*
+                                 * Found the first matching subtitle in our
+                                 * native language. Is it already selected?
+                                 */
+                                for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+                                {
+                                    subtitle2 =  hb_list_item( job->list_subtitle, i );
+                                    
+                                    if( subtitle2->track == subtitle->track) {
+                                        /*
+                                         * Already selected
+                                         */
+                                        break;
+                                    }
+                                    subtitle2 = NULL;
+                                }
+                                
+                                if( subtitle2 == NULL ) 
+                                {
+                                    /*
+                                     * Not already selected, so select it.
+                                     */
+                                    hb_subtitle_config_t sub_config;
+
+                                    if( native_dub )
+                                    {
+                                        fprintf( stderr, "Warning: no matching audio for native language - using subtitles instead.\n");
+                                    }
+                                    sub_config = subtitle->config;
+
+                                    if( mux == HB_MUX_MKV || subtitle->format == TEXTSUB)
+                                    {
+                                        sub_config.dest = PASSTHRUSUB;
+                                    }
+
+                                    sub_config.force = 0;
+                                    sub_config.default_track = 1;
+                                    hb_subtitle_add( job, &sub_config, matched_track);
+                                }
+                                /*
+                                 * Stop searching.
+                                 */
+                                break;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -2193,15 +2307,18 @@ static void ShowHelp()
     "          <number>          to be displayed upon playback.  Settings no default\n"
     "                            means no subtitle will be automatically displayed\n"
     "                            If \"number\" is omitted, the first trac is default.\n"
-    "    -N, --native-language   Select subtitles with this language if it does not\n"
-    "          <string>          match the Audio language. Provide the language's\n"
-    "                            iso639-2 code (fre, eng, spa, dut, et cetera)\n"
-    "                            --native-language may be used in conjunction with\n"
-    "                            a subtitle \"scan\", in which case all tracks\n"
-    "                            matching native language will be scanned.\n"
-    "                            Otherwise --native-language is mutually exclusive\n"
-    "                            with --subtitle\n"
-
+    "    -N, --native-language   Specifiy the your language preference. When the first\n"
+    "          <string>          audio track does not match your native language then\n"
+    "                            select the first subtitle that does. When used in\n"
+    "                            conjunction with --native-dub the audio track is\n"
+    "                            changed in preference to subtitles. Provide the\n"
+    "                            language's iso639-2 code (fre, eng, spa, dut, et cetera)\n"
+    "        --native-dub        Used in conjunction with --native-language\n"
+    "                            requests that if no audio tracks are selected the\n"
+    "                            default selected audio track will be the first one\n"
+    "                            that matches the --native-language. If there are no\n"
+    "                            matching audio tracks then the first matching\n"
+    "                            subtitle track is used instead.\n"
 
     "\n"
 
@@ -2303,6 +2420,7 @@ static int ParseOptions( int argc, char ** argv )
     #define KEEP_DISPLAY_ASPECT 265
     #define SUB_BURNED          266
     #define SUB_DEFAULT         267
+    #define NATIVE_DUB          268
     
     for( ;; )
     {
@@ -2334,6 +2452,7 @@ static int ParseOptions( int argc, char ** argv )
             { "subtitle-burned", optional_argument,   NULL,    SUB_BURNED },
             { "subtitle-default", optional_argument,   NULL,    SUB_DEFAULT },
             { "native-language", required_argument, NULL,'N' },
+            { "native-dub",  no_argument,       NULL,    NATIVE_DUB },
 
             { "encoder",     required_argument, NULL,    'e' },
             { "aencoder",    required_argument, NULL,    'E' },
@@ -2501,6 +2620,7 @@ static int ParseOptions( int argc, char ** argv )
                 if( optarg != NULL )
                 {
                     atracks = strdup( optarg );
+                    audio_explicit = 1;
                 }
                 else
                 {
@@ -2548,6 +2668,9 @@ static int ParseOptions( int argc, char ** argv )
             case 'N':
                 native_language = strdup( optarg );
                 break;
+            case NATIVE_DUB:
+                native_dub = 1;
+                break;
             case '2':
                 twoPass = 1;
                 break;