Changeset 8ba6d9a8eaa23172a6ae0939857c98a2025f3050

Timestamp:

19/12/05 17:36:30 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1135010190 +0000

git-parent:

[ab75c697fb9ebe0382836d48a5efde019acfa87b]

git-author:

Christophe Massiot <massiot@videolan.org> 1135010190 +0000

Message:

• src/input/es_out.c: New --audio-track-id and --sub-track-id options
  to select a precise track by its ID.
  
• modules/demux/ts.c: Enable --ts-es-id-pid by default since I see no
  drawback to it.
  

Files:

• modules/demux/ts.c (modified) (1 diff)
• src/input/es_out.c (modified) (4 diffs)
• src/input/var.c (modified) (2 diffs)
• src/libvlc.h (modified) (3 diffs)

modules/demux/ts.c

@@ -128 +128 @@
-
-    add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE );
-0
+1
-    add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE );
-    add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT,

src/input/es_out.c

@@ -104 +104 @@
-
-    /* es to select */
-
-
+, i_audio_id
+, i_sub_id
-    char        **ppsz_audio_language;
-    char        **ppsz_sub_language;
@@ -194 +194 @@
-    }
-    if( val.psz_string ) free( val.psz_string );
+
+    var_Get( p_input, "audio-track-id", &val );
+    p_sys->i_audio_id = val.i_int;
+
+    var_Get( p_input, "sub-track-id", &val );
+    p_sys->i_sub_id = val.i_int;
-
-    p_sys->p_es_audio = NULL;
@@ -904 +910 @@
-            if( p_sys->i_audio_last >= 0 )
-                i_wanted = p_sys->i_audio_last;
+
+            if( p_sys->i_audio_id >= 0 )
+            {
+                if( es->i_id == p_sys->i_audio_id )
+                    i_wanted = es->i_channel;
+                else
+                    return;
+            }
-        }
-        else if( i_cat == SPU_ES )
@@ -934 +948 @@
-            if( p_sys->i_sub_last >= 0 )
-                i_wanted  = p_sys->i_sub_last;
+
+            if( p_sys->i_sub_id >= 0 )
+            {
+                if( es->i_id == p_sys->i_sub_id )
+                    i_wanted = es->i_channel;
+                else
+                    return;
+            }
-        }
-        else if( i_cat == VIDEO_ES )

src/input/var.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
-: input.c 7955 2004-06-07 22:21:33Z fenrir 
+
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -396 +396 @@
-    var_Create( p_input, "sub-language", VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-
+    var_Create( p_input, "audio-track-id", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+    var_Create( p_input, "sub-track-id", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+
-    var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL |

src/libvlc.h

@@ -371 +371 @@
-#define INPUT_AUDIOTRACK_TEXT N_("Audio track")
-#define INPUT_AUDIOTRACK_LONGTEXT N_( \
-
+ 
-    "(from 0 to n).")
-
@@ -388 +388 @@
-    "Give the language of the subtitle track you want to use " \
-    "(comma separted, two or tree letter country code).")
+
+#define INPUT_AUDIOTRACK_ID_TEXT N_("Audio track ID")
+#define INPUT_AUDIOTRACK_ID_LONGTEXT N_( \
+    "Give the stream ID of the audio track you want to use.")
+
+#define INPUT_SUBTRACK_ID_TEXT N_("Subtitles track ID")
+#define INPUT_SUBTRACK_ID_LONGTEXT N_( \
+    "Give the stream ID of the subtitle track you want to use.")
-
-#define INPUT_REPEAT_TEXT N_("Input repetitions")
@@ -1133 +1141 @@
-                 INPUT_SUBTRACK_LANG_TEXT, INPUT_SUBTRACK_LANG_LONGTEXT,
-                  VLC_FALSE );
+    add_integer( "audio-track-id", -1, NULL, INPUT_AUDIOTRACK_ID_TEXT,
+                 INPUT_AUDIOTRACK_ID_LONGTEXT, VLC_TRUE );
+    add_integer( "sub-track-id", -1, NULL,
+                 INPUT_SUBTRACK_ID_TEXT, INPUT_SUBTRACK_ID_LONGTEXT, VLC_TRUE );
-
-    set_section( N_( "Playback control" ) , NULL);