/*****************************************************************************
* ps.c: Program Stream demux module for VLC.
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2009 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
#include "ps.h"
/*****************************************************************************
* 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();
- set_description( _("MPEG-PS demuxer") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux2", 1 );
- set_callbacks( Open, Close );
- add_shortcut( "ps" );
-
- add_integer( "ps-trust-timestamps", VLC_TRUE, NULL, TIME_TEXT,
- TIME_LONGTEXT, VLC_TRUE );
-
- add_submodule();
- set_description( _("MPEG-PS demuxer") );
- set_capability( "demux2", 9 );
- set_callbacks( OpenAlt, Close );
-vlc_module_end();
+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 )
+ change_safe ()
+
+ add_submodule ()
+ set_description( N_("MPEG-PS demuxer") )
+ set_capability( "demux", 8 )
+ set_callbacks( Open, Close )
+ add_shortcut( "ps" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
int i_time_track;
int64_t i_current_pts;
- vlc_bool_t b_lost_sync;
- vlc_bool_t b_have_pack;
- vlc_bool_t b_seekable;
+ int i_aob_mlp_count;
+
+ bool b_lost_sync;
+ bool b_have_pack;
+ bool b_seekable;
};
static int Demux ( demux_t *p_demux );
/*****************************************************************************
* Open
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+static int OpenCommon( vlc_object_t *p_this, bool 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 )
{
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" );
}
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;
p_sys->i_scr = -1;
p_sys->i_length = -1;
p_sys->i_current_pts = (mtime_t) 0;
-
- p_sys->b_lost_sync = VLC_FALSE;
- p_sys->b_have_pack = VLC_FALSE;
- p_sys->b_seekable = VLC_FALSE;
+ p_sys->i_time_track = -1;
+ p_sys->i_aob_mlp_count = 0;
+
+ p_sys->b_lost_sync = false;
+ p_sys->b_have_pack = false;
+ p_sys->b_seekable = false;
stream_Control( p_demux->s, STREAM_CAN_SEEK, &p_sys->b_seekable );
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, true );
+}
- return Open( p_this );
+static int Open( vlc_object_t *p_this )
+{
+ return OpenCommon( p_this, ((demux_t *)p_this)->b_force );
}
/*****************************************************************************
free( p_sys );
}
-static int Demux2( demux_t *p_demux )
+static int Demux2( demux_t *p_demux, bool b_end )
{
demux_sys_t *p_sys = p_demux->p_sys;
int i_ret, i_id;
if( !p_sys->b_lost_sync )
msg_Warn( p_demux, "garbage at input, trying to resync..." );
- p_sys->b_lost_sync = VLC_TRUE;
+ p_sys->b_lost_sync = true;
return 1;
}
if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" );
- p_sys->b_lost_sync = VLC_FALSE;
+ p_sys->b_lost_sync = false;
if( ( p_pkt = ps_pkt_read( p_demux->s, i_code ) ) == NULL )
{
ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)];
if( !ps_pkt_parse_pes( p_pkt, tk->i_skip ) )
{
- tk->i_last_pts = p_pkt->i_pts;
+ if( b_end && p_pkt->i_pts > tk->i_last_pts )
+ {
+ tk->i_last_pts = p_pkt->i_pts;
+ }
+ else if ( tk->i_first_pts == -1 )
+ {
+ tk->i_first_pts = p_pkt->i_pts;
+ }
}
}
block_Release( p_pkt );
int64_t i_current_pos = -1, i_size = 0, i_end = 0;
int i;
- if( !var_CreateGetInteger( p_demux, "ps-trust-timestamps" ) )
+ if( !var_CreateGetBool( p_demux, "ps-trust-timestamps" ) )
return;
if( p_sys->i_length == -1 ) /* First time */
{
+ p_sys->i_length = 0;
+ /* Check beginning */
+ i = 0;
i_current_pos = stream_Tell( p_demux->s );
+ 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( 100000, i_size ) );
- stream_Seek( p_demux->s, stream_Size( p_demux->s ) - i_end );
-
- while( Demux2( p_demux ) > 0 && !p_demux->b_die ) ;
+ i_end = __MAX( 0, __MIN( 200000, i_size ) );
+ stream_Seek( p_demux->s, i_size - i_end );
+ i = 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 );
}
for( i = 0; i < PS_TK_COUNT; i++ )
{
ps_track_t *tk = &p_sys->tk[i];
- if( tk->b_seen && tk->i_first_pts > 0 && tk->i_last_pts > 0 )
+ if( tk->i_first_pts >= 0 && tk->i_last_pts > 0 )
if( tk->i_last_pts > tk->i_first_pts )
{
int64_t i_length = (int64_t)tk->i_last_pts - tk->i_first_pts;
{
p_sys->i_length = i_length;
p_sys->i_time_track = i;
+ msg_Dbg( p_demux, "we found a length of: %"PRId64, p_sys->i_length );
}
}
}
- if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
}
/*****************************************************************************
if( !p_sys->b_lost_sync )
msg_Warn( p_demux, "garbage at input, trying to resync..." );
- p_sys->b_lost_sync = VLC_TRUE;
+ p_sys->b_lost_sync = true;
return 1;
}
if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" );
- p_sys->b_lost_sync = VLC_FALSE;
+ p_sys->b_lost_sync = false;
- if( p_sys->b_seekable && p_sys->i_length <= 0 )
+ if( p_sys->i_length < 0 && p_sys->b_seekable )
FindLength( p_demux );
if( ( p_pkt = ps_pkt_read( p_demux->s, i_code ) ) == NULL )
case 0x1ba:
if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) )
{
- if( !p_sys->b_have_pack ) p_sys->b_have_pack = VLC_TRUE;
+ if( !p_sys->b_have_pack ) p_sys->b_have_pack = true;
/* done later on to work around bad vcd/svcd streams */
/* es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr ); */
if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate;
default:
if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 )
{
- vlc_bool_t b_new = VLC_FALSE;
+ /* Small heuristic to improve MLP detection from AOB */
+ if( i_id == 0xa001 &&
+ p_sys->i_aob_mlp_count < 500 )
+ {
+ p_sys->i_aob_mlp_count++;
+ }
+ else if( i_id == 0xbda1 &&
+ p_sys->i_aob_mlp_count > 0 )
+ {
+ p_sys->i_aob_mlp_count--;
+ i_id = 0xa001;
+ }
+
+ bool b_new = false;
ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)];
if( !tk->b_seen )
if( !ps_track_fill( tk, &p_sys->psm, i_id ) )
{
tk->es = es_out_Add( p_demux->out, &tk->fmt );
- b_new = VLC_TRUE;
+ b_new = true;
}
else
{
msg_Dbg( p_demux, "es id=0x%x format unknown", i_id );
}
- tk->b_seen = VLC_TRUE;
+ tk->b_seen = true;
}
/* The popular VCD/SVCD subtitling WinSubMux does not
* renumber the SCRs when merging subtitles into the PES */
if( tk->b_seen &&
- ( tk->fmt.i_codec == VLC_FOURCC('o','g','t',' ') ||
- tk->fmt.i_codec == VLC_FOURCC('c','v','d',' ') ) )
+ ( tk->fmt.i_codec == VLC_CODEC_OGT ||
+ tk->fmt.i_codec == VLC_CODEC_CVD ) )
{
p_sys->i_scr = -1;
}
- if( p_sys->i_scr > 0 )
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr );
+ if( p_sys->i_scr >= 0 )
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_scr );
p_sys->i_scr = -1;
if( tk->b_seen && tk->es &&
- !ps_pkt_parse_pes( p_pkt, tk->i_skip ) )
+ (
+#ifdef ZVBI_COMPILED /* FIXME!! */
+ tk->fmt.i_codec == VLC_CODEC_TELETEXT ||
+#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 > VLC_TS_INVALID) )
{
/* 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: %"PRId64, p_pkt->i_pts );
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts );
}
- if( !tk->i_first_pts && p_pkt->i_pts > 0 )
- {
- tk->i_first_pts = p_pkt->i_pts;
- p_sys->i_length = 0;
- }
if( (int64_t)p_pkt->i_pts > p_sys->i_current_pts )
{
p_sys->i_current_pts = (int64_t)p_pkt->i_pts;
i64 = stream_Size( p_demux->s );
if( i64 > 0 )
{
- *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
+ double current = stream_Tell( p_demux->s );
+ *pf = current / (double)i64;
}
else
{
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) );
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->i_current_pts > 0 )
+ if( p_sys->i_time_track >= 0 && p_sys->i_current_pts > 0 )
{
*pi64 = p_sys->i_current_pts - p_sys->tk[p_sys->i_time_track].i_first_pts;
return VLC_SUCCESS;
return VLC_EGENERIC;
case DEMUX_SET_TIME:
+ i64 = (int64_t)va_arg( args, int64_t );
+ if( p_sys->i_time_track >= 0 && p_sys->i_current_pts > 0 )
+ {
+ int64_t i_now = p_sys->i_current_pts - p_sys->tk[p_sys->i_time_track].i_first_pts;
+ int64_t i_pos = stream_Tell( p_demux->s );
+
+ if( !i_now )
+ return i64 ? VLC_EGENERIC : VLC_SUCCESS;
+
+ p_sys->i_current_pts = 0;
+ i_pos *= (float)i64 / (float)i_now;
+ stream_Seek( p_demux->s, i_pos );
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+
case DEMUX_GET_FPS:
default:
return VLC_EGENERIC;
* Divers:
*****************************************************************************/
-/* PSResynch: resynch on a system starcode
+/* PSResynch: resynch on a system startcode
* It doesn't skip more than 512 bytes
* -1 -> error, 0 -> not synch, 1 -> ok
*/
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;
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 );
+ 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;