Changeset 1f0742025c2fbfd1cbeb94f0728bdcf155091498

Timestamp:

09/10/07 03:53:28 (1 year ago)

Author:

Bernie Purcell <bitmap@videolan.org>

git-committer:

Bernie Purcell <bitmap@videolan.org> 1189389208 +0000

git-parent:

[8b0e6890b6d468d83d29d907954826801abdea83]

git-author:

Bernie Purcell <bitmap@videolan.org> 1189389208 +0000

Message:

Select subtitle stream from the mkv container automatically
if it has a DEFAULT flag on it. User overrides for
preferred language should continue to take precedence.
The current versions of MKVToolnix correctly support DEFAULT
track tag but some older versions don't. If you want to have
subtitle streams in your mkv file, but not have them activate
by default, try remuxing any files causing you trouble, with
the current version of MKVToolnix, and turning the DEFAULT
track flag option to NO for all subtitles streams.
MKVToolnix is available from http://www.bunkus.org/videotools/mkvtoolnix/

Files:

• include/vlc_es_out.h (modified) (1 diff)
• modules/demux/mkv.cpp (modified) (1 diff)
• src/input/es_out.c (modified) (4 diffs)

include/vlc_es_out.h

@@ -55 +55 @@
-    /* set es selected for the es category(audio/video/spu) */
-    ES_OUT_SET_ES,      /* arg1= es_out_id_t*                   */
+
+    /* set 'default' tag on es (copied across from container) */
+    ES_OUT_SET_DEFAULT, /* arg1= es_out_id_t*                   */
-
-    /* force selection/unselection of the ES (bypass current mode)*/

modules/demux/mkv.cpp

@@ -2619 +2619 @@
-
-        tracks[i_track]->p_es = es_out_Add( sys.demuxer.out, &tracks[i_track]->fmt );
+
+        /* Turn on a subtitles track if it has been flagged as default -
+         * but only do this if no subtitles track has already been engaged,
+         * either by an earlier 'default track' (??) or by default
+         * language choice behaviour.
+         */
+        if( tracks[i_track]->b_default )
+        {
+            es_out_Control( sys.demuxer.out,
+                            ES_OUT_SET_DEFAULT,
+                            tracks[i_track]->p_es );
+        }
-
-        es_out_Control( sys.demuxer.out, ES_OUT_SET_NEXT_DISPLAY_TIME, tracks[i_track]->p_es, i_start_time );

src/input/es_out.c

@@ -109 +109 @@
-    int         i_audio_last, i_audio_id;
-    int         i_sub_last, i_sub_id;
+    int         i_default_sub_id;   /* As specified in container; if applicable */
-    char        **ppsz_audio_language;
-    char        **ppsz_sub_language;
@@ -179 +180 @@
-    var_Get( p_input, "sub-track", &val );
-    p_sys->i_sub_last = val.i_int;
+
+    p_sys->i_default_sub_id   = -1;
-
-    if( !p_input->b_preparsing )
@@ -1129 +1132 @@
-                i_wanted  = es->i_channel;
-            }
+            else if( p_sys->i_default_sub_id >= 0 )
+            {
+                if( es->i_id == p_sys->i_default_sub_id )
+                    i_wanted = es->i_channel;
+            }
+
-            if( p_sys->i_sub_last >= 0 )
-                i_wanted  = p_sys->i_sub_last;
@@ -1492 +1501 @@
-            }
-            return VLC_SUCCESS;
+            
+        case ES_OUT_SET_DEFAULT:
+        {
+            es = (es_out_id_t*) va_arg( args, es_out_id_t * );
+
+            if( es == NULL )
+            {
+                /*p_sys->i_default_video_id = -1;*/
+                /*p_sys->i_default_audio_id = -1;*/
+                p_sys->i_default_sub_id = -1;
+            }
+            else if( es == (es_out_id_t*)((uint8_t*)NULL+AUDIO_ES) )
+            {
+                /*p_sys->i_default_video_id = -1;*/
+            }
+            else if( es == (es_out_id_t*)((uint8_t*)NULL+VIDEO_ES) )
+            {
+                /*p_sys->i_default_audio_id = -1;*/
+            }
+            else if( es == (es_out_id_t*)((uint8_t*)NULL+SPU_ES) )
+            {
+                p_sys->i_default_sub_id = -1;
+            }
+            else
+            {
+                /*if( es->fmt.i_cat == VIDEO_ES )
+                    p_sys->i_default_video_id = es->i_id;
+                else
+                if( es->fmt.i_cat == AUDIO_ES )
+                    p_sys->i_default_audio_id = es->i_id;
+                else*/
+                if( es->fmt.i_cat == SPU_ES )
+                    p_sys->i_default_sub_id = es->i_id;
+            }
+            return VLC_SUCCESS;
+        }
-
-        case ES_OUT_SET_PCR: