Trailing ;

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index ac588a702ade7972f0a0e267a2dda7abbdd11c42..e2b6c3774afa8e3319d27c23a3779bcbb002ff64 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 
@@ -52,22 +52,23 @@ static int  OpenForce( vlc_object_t * );
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
-vlc_module_begin();
-    set_description( _("MPEG-PS demuxer") );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux", 1 );
-    set_callbacks( OpenForce, Close );
-    add_shortcut( "ps" );
+vlc_module_begin ()
+    set_description( N_("MPEG-PS demuxer") )
+    set_shortname( N_("PS") )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_capability( "demux", 1 )
+    set_callbacks( OpenForce, Close )
+    add_shortcut( "ps" )
 
     add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT,
-                 TIME_LONGTEXT, true );
+                 TIME_LONGTEXT, true )
 
-    add_submodule();
-    set_description( _("MPEG-PS demuxer") );
-    set_capability( "demux", 8 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+    add_submodule ()
+    set_description( N_("MPEG-PS demuxer") )
+    set_capability( "demux", 8 )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -124,6 +125,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_force )
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys ) return VLC_ENOMEM;
 
     /* Init p_sys */
     p_sys->i_mux_rate = 0;
@@ -242,14 +244,15 @@ static void FindLength( demux_t *p_demux )
         /* Check beginning */
         i = 0;
         i_current_pos = stream_Tell( p_demux->s );
-        while( !p_demux->b_die && i < 40 && Demux2( p_demux, false ) > 0 ) i++;
+        while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, false ) > 0 ) i++;
 
         /* Check end */
         i_size = stream_Size( p_demux->s );
         i_end = __MAX( 0, __MIN( 200000, i_size ) );
         stream_Seek( p_demux->s, i_size - i_end );
+        i = 0;
 
-        while( !p_demux->b_die && Demux2( p_demux, true ) > 0 );
+        while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, true ) > 0 );
         if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
     }
 
@@ -382,10 +385,15 @@ static int Demux( demux_t *p_demux )
             p_sys->i_scr = -1;
 
             if( tk->b_seen && tk->es &&
-                ( tk->fmt.i_codec == VLC_FOURCC('t','e','l','x') ||
-                  !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) )
+                (
+#ifdef ZVBI_COMPILED /* FIXME!! */
+                tk->fmt.i_codec == VLC_FOURCC('t','e','l','x') ||
+#endif
+                !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) )
             {
-                if( !b_new && !p_sys->b_have_pack && tk->fmt.i_cat == AUDIO_ES && p_pkt->i_pts > 0 )
+                if( !b_new && !p_sys->b_have_pack &&
+                    (tk->fmt.i_cat == AUDIO_ES) &&
+                    (p_pkt->i_pts > 0) )
                 {
                     /* A hack to sync the A/V on PES files. */
                     msg_Dbg( p_demux, "force SCR: %"PRId64, p_pkt->i_pts );
@@ -442,7 +450,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             f = (double) va_arg( args, double );
             i64 = stream_Size( p_demux->s );
             p_sys->i_current_pts = 0;
-            es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 
             return stream_Seek( p_demux->s, (int64_t)(i64 * f) );
 
@@ -487,7 +494,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 int64_t i_offset = i_pos / (i_now / 1000000) * ((i64 - i_now) / 1000000);
                 stream_Seek( p_demux->s, i_pos + i_offset);
 
-                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
                 return VLC_SUCCESS;
             }
             return VLC_EGENERIC;
@@ -553,9 +559,15 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
 {
     const uint8_t *p_peek;
     int      i_peek = stream_Peek( s, &p_peek, 14 );
-    int      i_size = ps_pkt_size( p_peek, i_peek );
+    int      i_size;
+    VLC_UNUSED(i_code);
+
+    /* Smallest valid packet */
+    if( i_peek < 6 ) return NULL;
+
+    i_size = ps_pkt_size( p_peek, i_peek );
 
-    if( i_size <= 6 && p_peek[3] > 0xba )
+    if( i_size < 0 || ( i_size <= 6 && p_peek[3] > 0xba ) )
     {
         /* Special case, search the next start code */
         i_size = 6;