* Stringreview !!!

[vlc] / modules / demux / mpeg / ts.c

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index db0827b495e899a4a99d092642eccdcbbc1dc3ab..b1fdd02485f657a0a6e75bb2427ecccf7b538f04 100644 (file)
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
- * Copyright (C) 2000, 2001, 2003 VideoLAN
- * $Id: ts.c,v 1.44 2004/01/09 00:30:29 gbazin Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id: ts.c,v 1.46 2004/01/25 20:05:28 hartman Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -138,7 +138,7 @@ vlc_module_begin();
     set_capability( "demux", 170 );
     add_shortcut( "ts_dvbpsi" );
 #endif
-    add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
+
     add_bool( "vls-backwards-compat", 0, NULL,
               VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT, VLC_TRUE );
     add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT, VLC_TRUE );
@@ -156,42 +156,63 @@ static int Activate( vlc_object_t * p_this )
     es_ts_data_t *      p_demux_data;
     stream_ts_data_t *  p_stream_data;
     byte_t *            p_peek;
+    vlc_bool_t          b_force = VLC_FALSE;
+    int                 i_sync_pos;
 
     /* Set the demux function */
     p_input->pf_demux = Demux;
     p_input->pf_demux_control = demux_vaControlDefault;
 
-#if 0
-    /* XXX Unused already done by src/input.c */
-    /* Initialize access plug-in structures. */
-    if( p_input->i_mtu == 0 )
-    {
-        /* Improve speed. */
-        msg_Dbg( p_input, "using default mtu (%d) with bufsize (%d)\n",
-                 p_input->i_mtu, INPUT_DEFAULT_BUFSIZE );
-        p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
-    }
-#endif
-
-    /* Have a peep at the show. */
-    if( input_Peek( p_input, &p_peek, 1 ) < 1 )
+    /* Have a peep at the show */
+    if( input_Peek( p_input, &p_peek, TS_PACKET_SIZE ) < TS_PACKET_SIZE )
     {
         msg_Err( p_input, "cannot peek()" );
-        return -1;
+        return VLC_EGENERIC;
     }
 
-    if( *p_peek != TS_SYNC_CODE )
+    if( *p_input->psz_demux && ( !strncmp( p_input->psz_demux, "ts", 3 )
+         || !strncmp( p_input->psz_demux, "ts_dvbpsi", 10 ) ) )
+        b_force = VLC_TRUE;
+
+    /* In a TS_PACKET_SIZE buffer we should find a sync byte */
+    for( i_sync_pos = 0; i_sync_pos < TS_PACKET_SIZE &&
+         p_peek[i_sync_pos] != TS_SYNC_CODE; i_sync_pos++ );
+
+    if( i_sync_pos >= TS_PACKET_SIZE )
     {
-        if( *p_input->psz_demux && ( !strncmp( p_input->psz_demux, "ts", 3 )
-                         || !strncmp( p_input->psz_demux, "ts_dvbpsi", 10 ) ) )
+        if( b_force )
         {
             /* User forced */
-            msg_Err( p_input, "this does not look like a TS stream, continuing" );
+            msg_Err( p_input, "this does not look like a TS stream, "
+                     "continuing anyway" );
         }
         else
         {
             msg_Warn( p_input, "TS module discarded (no sync)" );
-            return -1;
+            return VLC_EGENERIC;
+        }
+    }
+
+    /* Now that we have the first TS_SYNC_CODE, check the following
+     * TS_SYNC_CODEs are where they are supposed to be (one byte sync code
+     * is not enough to ensure the sync). */
+    if( !b_force )
+    {
+        if( input_Peek( p_input, &p_peek, TS_PACKET_SIZE * TS_SYNC_CODES_MIN )
+            < TS_PACKET_SIZE * TS_SYNC_CODES_MIN )
+        {
+            msg_Err( p_input, "cannot peek()" );
+            return VLC_EGENERIC;
+        }
+
+        for( ; i_sync_pos < TS_PACKET_SIZE * TS_SYNC_CODES_MIN;
+             i_sync_pos += TS_PACKET_SIZE )
+        {
+            if( p_peek[i_sync_pos] != TS_SYNC_CODE )
+            {
+                msg_Warn( p_input, "TS module discarded (lost sync)" );
+                return VLC_EGENERIC;
+            }
         }
     }
 
@@ -1213,7 +1234,7 @@ static void TS_DVBPSI_HandlePAT( input_thread_t * p_input,
           ( p_new_pat->i_version != p_stream_data->i_pat_version ) ) ||
         p_stream_data->i_pat_version == PAT_UNINITIALIZED  )
     {
-        msg_Dbg( p_input, "Processing PAT version %d", p_new_pat->i_version );
+        msg_Dbg( p_input, "processing PAT version %d", p_new_pat->i_version );
 
         /* Delete all programs */
         while( p_input->stream.i_pgrm_number )
@@ -1238,7 +1259,7 @@ static void TS_DVBPSI_HandlePAT( input_thread_t * p_input,
 
         while( p_pgrm )
         {
-            msg_Dbg( p_input, "New program: %d", p_pgrm->i_number );
+            msg_Dbg( p_input, "new program: %d", p_pgrm->i_number );
 
             /* If program = 0, we're having info about NIT not PMT */
             if( p_pgrm->i_number )
@@ -1316,7 +1337,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
         dvbpsi_descriptor_t *p_dr = p_new_pmt->p_first_descriptor;
         int i_loop;
 
-        msg_Dbg( p_input, "Processing PMT for program %d version %d",
+        msg_Dbg( p_input, "processing PMT for program %d version %d",
                  p_new_pmt->i_program_number, p_new_pmt->i_version );
 
         /* Delete all ES in this program  except the PSI. We start from the
@@ -1698,7 +1719,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
                 if( i_fourcc == VLC_FOURCC(0,0,0,0) )
                 {
                     msg_Warn( p_input,
-                              "Unknown codec/type for Private PES stream" );
+                              "unknown codec/type for Private PES stream" );
                 }
             }