Changeset d0dd8179b650055dcdf4b095c5690427a767fa2e

Timestamp:

07/04/08 22:22:33 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1215202953 +0000

git-parent:

[1d5ae295cd462d70d24cfad65b38638a1bb9407c]

git-author:

Laurent Aimar <fenrir@videolan.org> 1215202926 +0000

Message:

Fixed and improved ts-extra-pmt option (close #1592).
If you specify and extra pmt, the parsing of the PAT will be disabled
(unlike previous behaviour).
You can now just specify the pid and number of your program and it will
automatically be used.
You can specify es by type (video, audio, spu) and fourcc instead of
stream type.
You can specify the pcr pid.

Files:

• modules/demux/ts.c (modified) (9 diffs)

modules/demux/ts.c

@@ -99 +99 @@
-static void Close ( vlc_object_t * );
-
+/* TODO
+ * - Rename "extra pmt" to "user pmt"
+ * - Update extra pmt description
+ *      pmt_pid[:pmt_number]=pid_description[,pid_description]
+ *      where pid_description could take 3 forms:
+ *          1. pid:pcr (to force the pcr pid)
+ *          2. pid:stream_type
+ *          3. pid:type:fourcc where type=(video|audio|spu)
+ */
-#define PMT_TEXT N_("Extra PMT")
-#define PMT_LONGTEXT N_( \
@@ -334 +343 @@
-
-    /* All PMT */
+    bool        b_user_pmt;
-    int         i_pmt;
-    ts_pid_t    **pmt;
@@ -390 +400 @@
-static void              IODFree( iod_descriptor_t * );
-
+#define TS_USER_PMT_NUMBER (0)
-static int UserPmt( demux_t *p_demux, const char * );
-
@@ -714 +725 @@
-    var_Create( p_demux, "ts-extra-pmt", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Get( p_demux, "ts-extra-pmt", &val );
-
+
+
-        UserPmt( p_demux, val.psz_string );
-    free( val.psz_string );
@@ -1391 +1403 @@
-    char *psz = psz_dup;
-    int  i_pid;
+    int  i_number;
-
-    if( !psz_dup )
-        return VLC_ENOMEM;
-
+    /* Parse PID */
-    i_pid = strtol( psz, &psz, 0 );
-    if( i_pid < 2 || i_pid >= 8192 )
-        goto error;
-
+    /* Parse optional program number */
+    i_number = 0;
+    if( *psz == ':' )
+        i_number = strtol( &psz[1], &psz, 0 );
+
+    /* */
-    ts_pid_t *pmt = &p_sys->pid[i_pid];
-    ts_prg_psi_t *prg;
-
-extra pmt specified (pid=%d)", i_pid
+user pmt specified (pid=%d,number=%d)", i_pid, i_number
-    PIDInit( pmt, true, NULL );
-
@@ -1413 +1433 @@
-    prg->i_pid_pcr  = -1;
-    prg->i_pid_pmt  = -1;
-
-
+
+
+
-    TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg );
-
-
+
+
+
-    while( psz && *psz )
-    {
-        char *psz_next = strchr( psz, ',' );
-, i_stream_type
+
-
-        if( psz_next )
-        {
-            *psz_next++ = '\0';
-        }
-
-        i_pid = strtol( psz, &psz, 0 );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        psz = psz_next;
-    }
-
+    p_sys->b_user_pmt = true;
+    TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
-    free( psz_dup );
-    return VLC_SUCCESS;
@@ -2978 +3029 @@
-        for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
-        {
-if( p_sys->pmt[i]->psi->prg[i_prg]->i_number ==
-   
+const int i_pmt_number = p_sys->pmt[i]->psi->prg[i_prg]->i_number;
+if( i_pmt_number != TS_USER_PMT_NUMBER && i_pmt_number ==
-            {
-                pmt = p_sys->pmt[i];
@@ -3852 +3903 @@
-    msg_Dbg( p_demux, "PATCallBack called" );
-
-
-
-
+
+
+
+
-    {
-        dvbpsi_DeletePAT( p_pat );
@@ -3947 +3999 @@
-            {
-                const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number;
-
-
+
-            }
-