Changeset 1d5ae295cd462d70d24cfad65b38638a1bb9407c

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:

[32e2a1b44afa08f7c4997f5a6884742a944c516f]

git-author:

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

Message:

Move extra PMT creation to its own function.

Files:

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

modules/demux/ts.c

@@ -389 +389 @@
-static iod_descriptor_t *IODNew( int , uint8_t * );
-static void              IODFree( iod_descriptor_t * );
+
+static int UserPmt( demux_t *p_demux, const char * );
-
-#define TS_PACKET_SIZE_188 188
@@ -713 +715 @@
-    var_Get( p_demux, "ts-extra-pmt", &val );
-    if( val.psz_string && strchr( val.psz_string, '=' ) != NULL )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    free( val.psz_string );
-
@@ -1448 +1380 @@
-            return VLC_EGENERIC;
-    }
+}
+
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static int UserPmt( demux_t *p_demux, const char *psz_fmt )
+{
+    demux_sys_t *p_sys = p_demux->p_sys;
+    char *psz_dup = strdup( psz_fmt );
+    char *psz = psz_dup;
+    int  i_pid;
+
+    if( !psz_dup )
+        return VLC_ENOMEM;
+
+    i_pid = strtol( psz, &psz, 0 );
+    if( i_pid < 2 || i_pid >= 8192 )
+        goto error;
+
+    ts_pid_t *pmt = &p_sys->pid[i_pid];
+    ts_prg_psi_t *prg;
+
+    msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid );
+    PIDInit( pmt, true, NULL );
+
+    /* Dummy PMT */
+    prg = malloc( sizeof( ts_prg_psi_t ) );
+    if( !prg )
+        goto error;
+
+    memset( prg, 0, sizeof( ts_prg_psi_t ) );
+    prg->i_pid_pcr  = -1;
+    prg->i_pid_pmt  = -1;
+    prg->i_number   = 0;    /* special */
+    prg->handle     = dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux );
+    TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg );
+
+    psz = strchr( psz, '=' ) + 1;   /* can't failed */
+    while( psz && *psz )
+    {
+        char *psz_next = strchr( psz, ',' );
+        int i_pid, i_stream_type;
+
+        if( psz_next )
+        {
+            *psz_next++ = '\0';
+        }
+
+        i_pid = strtol( psz, &psz, 0 );
+        if( *psz == ':' )
+        {
+            i_stream_type = strtol( psz + 1, &psz, 0 );
+            if( i_pid >= 2 && i_pid < 8192 &&
+                !p_sys->pid[i_pid].b_valid )
+            {
+                ts_pid_t *pid = &p_sys->pid[i_pid];
+
+                PIDInit( pid, false, pmt->psi);
+                if( pmt->psi->prg[0]->i_pid_pcr <= 0 )
+                {
+                    pmt->psi->prg[0]->i_pid_pcr = i_pid;
+                }
+                PIDFillFormat( pid, i_stream_type);
+                if( pid->es->fmt.i_cat != UNKNOWN_ES )
+                {
+                    if( p_sys->b_es_id_pid )
+                    {
+                        pid->es->fmt.i_id = i_pid;
+                    }
+                    msg_Dbg( p_demux, "  * es pid=%d type=%d "
+                             "fcc=%4.4s", i_pid, i_stream_type,
+                             (char*)&pid->es->fmt.i_codec );
+                    pid->es->id = es_out_Add( p_demux->out,
+                                              &pid->es->fmt );
+                }
+            }
+        }
+        psz = psz_next;
+    }
+
+    free( psz_dup );
+    return VLC_SUCCESS;
+
+error:
+    free( psz_dup );
+    return VLC_EGENERIC;
-}
-