macosx interface: fix regression introduced in [21230]. patch by John Dalgliesh

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index f2f0a7805fb1205de5a5d3be25c0285bb89a6b2a..7e50a49e70de1a51aab7ef8f36091d689b4116b4 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
@@ -44,8 +43,8 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+static int  OpenForce( vlc_object_t * );
 static int  Open   ( vlc_object_t * );
-static int  OpenAlt( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
@@ -53,7 +52,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux2", 1 );
-    set_callbacks( Open, Close );
+    set_callbacks( OpenForce, Close );
     add_shortcut( "ps" );
 
     add_bool( "ps-trust-timestamps", VLC_TRUE, NULL, TIME_TEXT,
@@ -61,8 +60,8 @@ vlc_module_begin();
 
     add_submodule();
     set_description( _("MPEG-PS demuxer") );
-    set_capability( "demux2", 9 );
-    set_callbacks( OpenAlt, Close );
+    set_capability( "demux2", 8 );
+    set_callbacks( Open, Close );
 vlc_module_end();
 
 /*****************************************************************************
@@ -94,12 +93,12 @@ static block_t *ps_pkt_read   ( stream_t *, uint32_t i_code );
 /*****************************************************************************
  * Open
  *****************************************************************************/
-static int Open( vlc_object_t *p_this )
+static int OpenCommon( vlc_object_t *p_this, vlc_bool_t b_force )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
 
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
     {
@@ -107,9 +106,11 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    if( p_peek[0] != 0 || p_peek[1] != 0 ||
-        p_peek[2] != 1 || p_peek[3] < 0xb9 )
+    if( memcmp( p_peek, "\x00\x00\x01", 3 ) || ( p_peek[3] < 0xb9 ) )
     {
+        if( !b_force )
+            return VLC_EGENERIC;
+
         msg_Warn( p_demux, "this does not look like an MPEG PS stream, "
                   "continuing anyway" );
     }
@@ -125,7 +126,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_length   = -1;
     p_sys->i_current_pts = (mtime_t) 0;
     p_sys->i_time_track = -1;
-    
+
     p_sys->b_lost_sync = VLC_FALSE;
     p_sys->b_have_pack = VLC_FALSE;
     p_sys->b_seekable  = VLC_FALSE;
@@ -140,24 +141,14 @@ static int Open( vlc_object_t *p_this )
     return VLC_SUCCESS;
 }
 
-static int OpenAlt( vlc_object_t *p_this )
+static int OpenForce( vlc_object_t *p_this )
 {
-    demux_t *p_demux = (demux_t*)p_this;
-    uint8_t *p_peek;
-
-    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
-    {
-        msg_Err( p_demux, "cannot peek" );
-        return VLC_EGENERIC;
-    }
-
-    if( p_peek[0] != 0 || p_peek[1] != 0 ||
-        p_peek[2] != 1 || p_peek[3] < 0xb9 )
-    {
-        if( !p_demux->b_force ) return VLC_EGENERIC;
-    }
+    return OpenCommon( p_this, VLC_TRUE );
+}
 
-    return Open( p_this );
+static int Open( vlc_object_t *p_this )
+{
+    return OpenCommon( p_this, ((demux_t *)p_this)->b_force );
 }
 
 /*****************************************************************************
@@ -252,7 +243,7 @@ static void FindLength( demux_t *p_demux )
         i_size = stream_Size( p_demux->s );
         i_end = __MAX( 0, __MIN( 200000, i_size ) );
         stream_Seek( p_demux->s, i_size - i_end );
-    
+
         while( !p_demux->b_die && Demux2( p_demux, VLC_TRUE ) > 0 );
         if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
     }
@@ -268,7 +259,7 @@ static void FindLength( demux_t *p_demux )
                 {
                     p_sys->i_length = i_length;
                     p_sys->i_time_track = i;
-                    msg_Dbg( p_demux, "we found a length of: %lld", p_sys->i_length );
+                    msg_Dbg( p_demux, "we found a length of: "I64Fd, p_sys->i_length );
                 }
             }
     }
@@ -391,7 +382,7 @@ static int Demux( demux_t *p_demux )
                 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: %lld", p_pkt->i_pts );
+                    msg_Dbg( p_demux, "force SCR: "I64Fd, p_pkt->i_pts );
                     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts );
                 }
 
@@ -511,7 +502,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
  */
 static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int     i_peek;
     int     i_skip;
 
@@ -554,7 +545,7 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code )
 
 static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     int      i_peek = stream_Peek( s, &p_peek, 14 );
     int      i_size = ps_pkt_size( p_peek, i_peek );