/*****************************************************************************
* ps.c: Program Stream demux module for VLC.
*****************************************************************************
- * Copyright (C) 2004-2009 the VideoLAN team
+ * Copyright (C) 2004-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
set_callbacks( OpenForce, Close )
add_shortcut( "ps" )
- add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT,
+ add_bool( "ps-trust-timestamps", true, TIME_TEXT,
TIME_LONGTEXT, true )
change_safe ()
ps_track_t tk[PS_TK_COUNT];
int64_t i_scr;
+ int64_t i_last_scr;
int i_mux_rate;
int64_t i_length;
int i_time_track;
}
/* Fill p_demux field */
- 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;
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+
/* Init p_sys */
p_sys->i_mux_rate = 0;
p_sys->i_scr = -1;
+ p_sys->i_last_scr = -1;
p_sys->i_length = -1;
p_sys->i_current_pts = (mtime_t) 0;
p_sys->i_time_track = -1;
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( !ps_pkt_parse_pes( p_pkt, tk->i_skip ) && p_pkt->i_pts > VLC_TS_INVALID )
{
if( b_end && p_pkt->i_pts > tk->i_last_pts )
{
{
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_CreateGetBool( p_demux, "ps-trust-timestamps" ) )
return;
{
p_sys->i_length = 0;
/* Check beginning */
- i = 0;
+ int i = 0;
i_current_pos = stream_Tell( p_demux->s );
- while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, false ) > 0 ) i++;
+ while( i < 40 && Demux2( p_demux, false ) > 0 ) i++;
/* Check end */
i_size = stream_Size( p_demux->s );
- i_end = __MAX( 0, __MIN( 200000, i_size ) );
+ i_end = VLC_CLIP( i_size, 0, 200000 );
stream_Seek( p_demux->s, i_size - i_end );
- i = 0;
- while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, true ) > 0 );
+ i = 0;
+ while( i < 400 && Demux2( p_demux, true ) > 0 ) i++;
if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
}
- for( i = 0; i < PS_TK_COUNT; i++ )
+ /* Find the longest track */
+ for( int 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 )
+ if( tk->i_last_pts > 0 &&
+ 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 )
{
- 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: %"PRId64, 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: %"PRId64 "s", p_sys->i_length / CLOCK_FREQ );
}
+ }
}
}
case 0x1ba:
if( !ps_pkt_parse_pack( p_pkt, &p_sys->i_scr, &i_mux_rate ) )
{
+ p_sys->i_last_scr = p_sys->i_scr;
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( !tk->b_seen )
{
- if( !ps_track_fill( tk, &p_sys->psm, i_id ) )
+ if( !ps_track_fill( tk, &p_sys->psm, i_id, p_pkt ) )
{
tk->es = es_out_Add( p_demux->out, &tk->fmt );
b_new = true;
tk->fmt.i_codec == VLC_CODEC_CVD ) )
{
p_sys->i_scr = -1;
+ p_sys->i_last_scr = -1;
}
if( p_sys->i_scr >= 0 )
p_sys->i_scr = -1;
if( tk->b_seen && tk->es &&
- (
-#ifdef ZVBI_COMPILED /* FIXME!! */
- tk->fmt.i_codec == VLC_CODEC_TELETEXT ||
-#endif
- !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) )
+ !ps_pkt_parse_pes( p_pkt, tk->i_skip ) )
{
if( !b_new && !p_sys->b_have_pack &&
(tk->fmt.i_cat == AUDIO_ES) &&
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->fmt.i_codec == VLC_CODEC_TELETEXT &&
+ p_pkt->i_pts <= VLC_TS_INVALID && p_sys->i_last_scr >= 0 )
+ {
+ /* Teletext may have missing PTS (ETSI EN 300 472 Annexe A)
+ * In this case use the last SCR + 40ms */
+ p_pkt->i_pts = VLC_TS_0 + p_sys->i_last_scr + 40000;
+ }
if( (int64_t)p_pkt->i_pts > p_sys->i_current_pts )
{
break;
}
+ demux_UpdateTitleFromStream( p_demux );
return 1;
}
f = (double) va_arg( args, double );
i64 = stream_Size( p_demux->s );
p_sys->i_current_pts = 0;
+ p_sys->i_last_scr = -1;
return stream_Seek( p_demux->s, (int64_t)(i64 * f) );
return i64 ? VLC_EGENERIC : VLC_SUCCESS;
p_sys->i_current_pts = 0;
+ p_sys->i_last_scr = -1;
i_pos *= (float)i64 / (float)i_now;
stream_Seek( p_demux->s, i_pos );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
+ case DEMUX_GET_TITLE_INFO:
+ {
+ struct input_title_t ***v = va_arg( args, struct input_title_t*** );
+ int *c = va_arg( args, int * );
+
+ *va_arg( args, int* ) = 0; /* Title offset */
+ *va_arg( args, int* ) = 0; /* Chapter offset */
+ return stream_Control( p_demux->s, STREAM_GET_TITLE_INFO, v, c );
+ }
+
+ case DEMUX_SET_TITLE:
+ return stream_vaControl( p_demux->s, STREAM_SET_TITLE, args );
+
+ case DEMUX_SET_SEEKPOINT:
+ return stream_vaControl( p_demux->s, STREAM_SET_SEEKPOINT, args );
+
+ case DEMUX_GET_META:
+ return stream_vaControl( p_demux->s, STREAM_GET_META, args );
+
case DEMUX_GET_FPS:
default:
return VLC_EGENERIC;