#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/input.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_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
set_capability( "demux2", 1 );
- set_callbacks( Open, Close );
+ set_callbacks( OpenForce, Close );
add_shortcut( "ps" );
- add_integer( "ps-trust-timestamps", VLC_TRUE, NULL, TIME_TEXT,
+ add_bool( "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 );
+ set_callbacks( Open, Close );
vlc_module_end();
/*****************************************************************************
/*****************************************************************************
* 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;
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_sys->i_scr = -1;
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;
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 );
}
/*****************************************************************************
free( p_sys );
}
-static int Demux2( demux_t *p_demux )
+static int Demux2( demux_t *p_demux, vlc_bool_t b_end )
{
demux_sys_t *p_sys = p_demux->p_sys;
int i_ret, i_id;
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 );
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( !p_demux->b_die && i < 40 && Demux2( p_demux, VLC_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 );
+
+ while( !p_demux->b_die && Demux2( p_demux, VLC_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: %lld", 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, "found sync code" );
p_sys->b_lost_sync = VLC_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 )
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;
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 );
+ 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;
+
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
*/
projects / vlc / blobdiff