X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fps.c;h=97dd218ff400b589a55a11054e0914a58b938920;hb=65abf030acb9d0e88b0e3e36666ab5d2c5b613db;hp=3d90a25c438abcabafeffa121b2b97e1f6bfe049;hpb=e3a6345c819709da452d4db7ce123b8eba70cb6f;p=vlc diff --git a/modules/demux/ps.c b/modules/demux/ps.c index 3d90a25c43..97dd218ff4 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -1,7 +1,7 @@ /***************************************************************************** - * ps.c + * ps.c: Program Stream demux module for VLC. ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -36,17 +36,33 @@ * - ... */ +#define TIME_TEXT N_("Trust MPEG timestamps") +#define TIME_LONGTEXT N_("Normally we use the timestamps of the MPEG files " \ + "to calculate position and duration. However sometimes this might not " \ + "be usable. Disable this option to calculate from the bitrate instead." ) + /***************************************************************************** * Module descriptor *****************************************************************************/ -static int Open ( 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( _("PS demuxer") ); + 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(); /***************************************************************************** @@ -55,10 +71,18 @@ vlc_module_end(); struct demux_sys_t { - ps_track_t tk[PS_TK_COUNT]; + ps_psm_t psm; + ps_track_t tk[PS_TK_COUNT]; int64_t i_scr; int i_mux_rate; + int64_t i_length; + 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; }; static int Demux ( demux_t *p_demux ); @@ -83,9 +107,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( p_peek[0] != 0 || p_peek[1] != 0 || + p_peek[2] != 1 || p_peek[3] < 0xb9 ) { - msg_Warn( p_demux, "this does not look like an MPEG PS stream, continuing anyway" ); + msg_Warn( p_demux, "this does not look like an MPEG PS stream, " + "continuing anyway" ); } /* Fill p_demux field */ @@ -96,7 +122,17 @@ static int Open( vlc_object_t *p_this ) /* 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->i_time_track = -1; + + p_sys->b_lost_sync = VLC_FALSE; + p_sys->b_have_pack = VLC_FALSE; + p_sys->b_seekable = VLC_FALSE; + stream_Control( p_demux->s, STREAM_CAN_SEEK, &p_sys->b_seekable ); + + ps_psm_init( &p_sys->psm ); ps_track_init( p_sys->tk ); /* TODO prescanning of ES */ @@ -104,6 +140,26 @@ static int Open( vlc_object_t *p_this ) return VLC_SUCCESS; } +static int OpenAlt( 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 Open( p_this ); +} + /***************************************************************************** * Close *****************************************************************************/ @@ -111,19 +167,122 @@ static void Close( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; + int i; + + for( i = 0; i < PS_TK_COUNT; i++ ) + { + ps_track_t *tk = &p_sys->tk[i]; + if( tk->b_seen ) + { + es_format_Clean( &tk->fmt ); + if( tk->es ) es_out_Del( p_demux->out, tk->es ); + } + } + + ps_psm_destroy( &p_sys->psm ); free( p_sys ); } +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; + uint32_t i_code; + block_t *p_pkt; + + i_ret = ps_pkt_resynch( p_demux->s, &i_code ); + if( i_ret < 0 ) + { + return 0; + } + else if( i_ret == 0 ) + { + if( !p_sys->b_lost_sync ) + msg_Warn( p_demux, "garbage at input, trying to resync..." ); + + p_sys->b_lost_sync = VLC_TRUE; + return 1; + } + + if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" ); + p_sys->b_lost_sync = VLC_FALSE; + + if( ( p_pkt = ps_pkt_read( p_demux->s, i_code ) ) == NULL ) + { + return 0; + } + if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 ) + { + ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)]; + if( !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) + { + 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 ); + return 1; +} + +static void FindLength( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int64_t i_current_pos = -1, i_size = 0, i_end = 0; + int i; + + if( !var_CreateGetInteger( 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( !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( 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->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; + if( i_length > p_sys->i_length ) + { + 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 ); + } + } + } +} + /***************************************************************************** * Demux: *****************************************************************************/ static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - int i_ret; + int i_ret, i_id, i_mux_rate; uint32_t i_code; - block_t *p_pkt; + block_t *p_pkt; i_ret = ps_pkt_resynch( p_demux->s, &i_code ); if( i_ret < 0 ) @@ -132,10 +291,19 @@ static int Demux( demux_t *p_demux ) } else if( i_ret == 0 ) { - msg_Warn( p_demux, "garbage at input" ); + if( !p_sys->b_lost_sync ) + msg_Warn( p_demux, "garbage at input, trying to resync..." ); + + p_sys->b_lost_sync = VLC_TRUE; return 1; } + if( p_sys->b_lost_sync ) msg_Warn( p_demux, "found sync code" ); + p_sys->b_lost_sync = VLC_FALSE; + + 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 ) { return 0; @@ -143,76 +311,109 @@ static int Demux( demux_t *p_demux ) switch( i_code ) { - case 0x1b9: - block_Release( p_pkt ); - break; - case 0x1ba: + case 0x1b9: + block_Release( p_pkt ); + break; + + case 0x1ba: + if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) ) { - int i_mux_rate; + if( !p_sys->b_have_pack ) p_sys->b_have_pack = VLC_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; + } + block_Release( p_pkt ); + break; - if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) ) + case 0x1bb: + if( !ps_pkt_parse_system( p_pkt, &p_sys->psm, p_sys->tk ) ) + { + int i; + for( i = 0; i < PS_TK_COUNT; i++ ) { - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr ); - if( i_mux_rate > 0 ) + ps_track_t *tk = &p_sys->tk[i]; + + if( tk->b_seen && !tk->es && tk->fmt.i_cat != UNKNOWN_ES ) { - p_sys->i_mux_rate = i_mux_rate; + tk->es = es_out_Add( p_demux->out, &tk->fmt ); } } - block_Release( p_pkt ); - break; } - case 0x1bb: - if( !ps_pkt_parse_system( p_pkt, p_sys->tk ) ) + block_Release( p_pkt ); + break; + + case 0x1bc: + if( p_sys->psm.i_version == 0xFFFF ) + msg_Dbg( p_demux, "contains a PSM"); + + ps_psm_fill( &p_sys->psm, p_pkt, p_sys->tk, p_demux->out ); + block_Release( p_pkt ); + break; + + default: + if( (i_id = ps_pkt_id( p_pkt )) >= 0xc0 ) + { + vlc_bool_t b_new = VLC_FALSE; + ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)]; + + if( !tk->b_seen ) { - int i; - for( i = 0; i < PS_TK_COUNT; i++ ) + if( !ps_track_fill( tk, &p_sys->psm, i_id ) ) { - ps_track_t *tk = &p_sys->tk[i]; - - if( tk->b_seen && !tk->es && tk->fmt.i_cat != UNKNOWN_ES ) - { - tk->es = es_out_Add( p_demux->out, &tk->fmt ); - } + tk->es = es_out_Add( p_demux->out, &tk->fmt ); + b_new = VLC_TRUE; } + else + { + msg_Dbg( p_demux, "es id=0x%x format unknown", i_id ); + } + tk->b_seen = VLC_TRUE; } - block_Release( p_pkt ); - break; - case 0x1bc: - /* TODO PSM */ - block_Release( p_pkt ); - break; - default: - { - int i_id = ps_pkt_id( p_pkt ); - if( i_id >= 0xc0 ) + /* 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',' ') ) ) { - ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)]; + p_sys->i_scr = -1; + } - if( !tk->b_seen ) - { - if( !ps_track_fill( tk, i_id ) ) - { - tk->es = es_out_Add( p_demux->out, &tk->fmt ); - } - tk->b_seen = VLC_TRUE; - } - if( tk->b_seen && tk->es && !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) + if( p_sys->i_scr > 0 ) + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_scr ); + + p_sys->i_scr = -1; + + if( tk->b_seen && tk->es && + !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 ) { - es_out_Send( p_demux->out, tk->es, p_pkt ); + /* A hack to sync the A/V on PES files. */ + msg_Dbg( p_demux, "force SCR: %lld", p_pkt->i_pts ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts ); } - else + + if( (int64_t)p_pkt->i_pts > p_sys->i_current_pts ) { - block_Release( p_pkt ); + p_sys->i_current_pts = (int64_t)p_pkt->i_pts; } + + es_out_Send( p_demux->out, tk->es, p_pkt ); } else { block_Release( p_pkt ); } - break; } + else + { + block_Release( p_pkt ); + } + break; } + return 1; } @@ -239,19 +440,26 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *pf = 0.0; } return VLC_SUCCESS; + case DEMUX_SET_POSITION: 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_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; + } if( p_sys->i_mux_rate > 0 ) { - *pi64 = (int64_t)1000000 * ( stream_Tell( p_demux->s ) / 50 ) / p_sys->i_mux_rate; + *pi64 = (int64_t)1000000 * ( stream_Tell( p_demux->s ) / 50 ) / + p_sys->i_mux_rate; return VLC_SUCCESS; } *pi64 = 0; @@ -259,9 +467,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_LENGTH: pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) + if( p_sys->i_length > 0 ) { - *pi64 = (int64_t)1000000 * ( stream_Size( p_demux->s ) / 50 ) / p_sys->i_mux_rate; + *pi64 = p_sys->i_length; + return VLC_SUCCESS; + } + else if( p_sys->i_mux_rate > 0 ) + { + *pi64 = (int64_t)1000000 * ( stream_Size( p_demux->s ) / 50 ) / + p_sys->i_mux_rate; return VLC_SUCCESS; } *pi64 = 0; @@ -278,7 +492,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) * Divers: *****************************************************************************/ -/* PSResynch: resynch on a systeme starcode +/* PSResynch: resynch on a system starcode * It doesn't skip more than 512 bytes * -1 -> error, 0 -> not synch, 1 -> ok */ @@ -292,7 +506,8 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code ) { return -1; } - if( p_peek[0] == 0 && p_peek[1] == 0 && p_peek[2] == 1 && p_peek[3] >= 0xb9 ) + if( p_peek[0] == 0 && p_peek[1] == 0 && p_peek[2] == 1 && + p_peek[3] >= 0xb9 ) { *pi_code = 0x100 | p_peek[3]; return 1; @@ -310,7 +525,8 @@ static int ps_pkt_resynch( stream_t *s, uint32_t *pi_code ) { break; } - if( p_peek[0] == 0 && p_peek[1] == 0 && p_peek[2] == 1 && p_peek[3] >= 0xb9 ) + if( p_peek[0] == 0 && p_peek[1] == 0 && p_peek[2] == 1 && + p_peek[3] >= 0xb9 ) { *pi_code = 0x100 | p_peek[3]; return stream_Read( s, NULL, i_skip ) == i_skip ? 1 : -1; @@ -342,7 +558,8 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code ) } while( i_size <= i_peek - 4 ) { - if( p_peek[i_size] == 0x00 && p_peek[i_size+1] == 0x00 && p_peek[i_size+2] == 0x01 && p_peek[i_size+3] >= 0xb9 ) + if( p_peek[i_size] == 0x00 && p_peek[i_size+1] == 0x00 && + p_peek[i_size+2] == 0x01 && p_peek[i_size+3] >= 0xb9 ) { return stream_Block( s, i_size ); } @@ -353,9 +570,8 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code ) else { /* Normal case */ - return stream_Block( s, i_size ); + return stream_Block( s, i_size ); } return NULL; } -