X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fps.c;h=90cbbc6c79d81a03792c26ab837da259c336671f;hb=c6a78e1b9e0cd1b87783b024f66ee440965053d5;hp=da61b1284db382cccade30f66011d77e39b46ad0;hpb=55e26be2db6bf444085c04c33abe291b6684fb0a;p=vlc diff --git a/modules/demux/ps.c b/modules/demux/ps.c index da61b1284d..90cbbc6c79 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -18,16 +18,19 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include +#include #include "ps.h" @@ -36,25 +39,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 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( _("PS demuxer") ); + set_description( _("MPEG-PS demuxer") ); 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, + TIME_LONGTEXT, VLC_TRUE ); + add_submodule(); - set_description( _("PS demuxer") ); - set_capability( "demux2", 9 ); - set_callbacks( OpenAlt, Close ); + set_description( _("MPEG-PS demuxer") ); + set_capability( "demux2", 8 ); + set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** @@ -68,8 +79,13 @@ struct demux_sys_t 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 ); @@ -81,12 +97,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 ) { @@ -94,9 +110,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" ); } @@ -109,7 +127,15 @@ 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 ); @@ -119,24 +145,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 ); } /***************************************************************************** @@ -163,6 +179,96 @@ static void Close( vlc_object_t *p_this ) 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: "I64Fd, p_sys->i_length ); + } + } + } +} + /***************************************************************************** * Demux: *****************************************************************************/ @@ -190,6 +296,9 @@ static int Demux( demux_t *p_demux ) 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; @@ -204,6 +313,7 @@ static int Demux( demux_t *p_demux ) 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; /* 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; @@ -239,6 +349,7 @@ static int Demux( demux_t *p_demux ) 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 ) @@ -246,6 +357,7 @@ static int Demux( demux_t *p_demux ) if( !ps_track_fill( tk, &p_sys->psm, i_id ) ) { tk->es = es_out_Add( p_demux->out, &tk->fmt ); + b_new = VLC_TRUE; } else { @@ -271,6 +383,18 @@ static int Demux( demux_t *p_demux ) 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 ) + { + /* A hack to sync the A/V on PES files. */ + 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 ); + } + + if( (int64_t)p_pkt->i_pts > p_sys->i_current_pts ) + { + p_sys->i_current_pts = (int64_t)p_pkt->i_pts; + } + es_out_Send( p_demux->out, tk->es, p_pkt ); } else @@ -315,13 +439,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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 ) / @@ -333,7 +462,12 @@ 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 = 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; @@ -343,6 +477,19 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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; @@ -353,13 +500,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) * 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; @@ -402,7 +549,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 );