/*****************************************************************************
* input_clock.c: Clock/System date convertions, stream management
*****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_clock.c,v 1.22 2001/09/05 16:07:50 massiot Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: input_clock.c,v 1.39 2003/07/28 13:19:37 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
#include <string.h> /* memcpy(), memset() */
-#include <sys/types.h> /* off_t */
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "intf_msg.h"
+#include <vlc/vlc.h>
#include "stream_control.h"
#include "input_ext-intf.h"
* in all the FIFOs, but it may be not enough.
*/
+static void ClockNewRef( pgrm_descriptor_t * p_pgrm,
+ mtime_t i_clock, mtime_t i_sysdate );
+
/*****************************************************************************
* Constants
*****************************************************************************/
/* Maximum gap allowed between two CRs. */
#define CR_MAX_GAP 1000000
+/* Latency introduced on DVDs with CR == 0 on chapter change - this is from
+ * my dice --Meuuh */
+#define CR_MEAN_PTS_GAP 300000
+
/*****************************************************************************
* ClockToSysdate: converts a movie clock to system date
*****************************************************************************/
-static void ClockNewRef( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm,
- mtime_t i_clock, mtime_t i_sysdate );
static mtime_t ClockToSysdate( input_thread_t * p_input,
pgrm_descriptor_t * p_pgrm, mtime_t i_clock )
{
i_sysdate /= 27;
i_sysdate /= 1000;
i_sysdate += (mtime_t)p_pgrm->sysdate_ref;
+
+ if ( i_sysdate < mdate() - CR_MAX_GAP
+ || i_sysdate > mdate() + CR_MAX_GAP )
+ {
+ msg_Warn( p_input, "Bogus clock encountered, resetting" );
+ ClockNewRef( p_pgrm, i_clock, i_sysdate = mdate() );
+ }
}
return( i_sysdate );
/*****************************************************************************
* ClockNewRef: writes a new clock reference
*****************************************************************************/
-static void ClockNewRef( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm,
+static void ClockNewRef( pgrm_descriptor_t * p_pgrm,
mtime_t i_clock, mtime_t i_sysdate )
{
p_pgrm->cr_ref = i_clock;
- p_pgrm->sysdate_ref = i_sysdate;
+ p_pgrm->sysdate_ref = i_sysdate ;
}
/*****************************************************************************
void input_ClockInit( pgrm_descriptor_t * p_pgrm )
{
p_pgrm->last_cr = 0;
+ p_pgrm->last_pts = 0;
p_pgrm->cr_ref = 0;
p_pgrm->sysdate_ref = 0;
p_pgrm->delta_cr = 0;
if( p_input->stream.i_new_status == PAUSE_S )
{
int i_old_status;
+
vlc_mutex_lock( &p_input->stream.control.control_lock );
i_old_status = p_input->stream.control.i_status;
-
p_input->stream.control.i_status = PAUSE_S;
+ vlc_mutex_unlock( &p_input->stream.control.control_lock );
+
vlc_cond_wait( &p_input->stream.stream_wait,
&p_input->stream.stream_lock );
- ClockNewRef( p_input, p_pgrm, i_clock, mdate() );
+ ClockNewRef( p_pgrm, i_clock, p_pgrm->last_pts > mdate() ?
+ p_pgrm->last_pts : mdate() );
if( p_input->stream.i_new_status == PAUSE_S )
- {
+ {
/* PAUSE_S undoes the pause state: Return to old state. */
+ vlc_mutex_lock( &p_input->stream.control.control_lock );
p_input->stream.control.i_status = i_old_status;
+ vlc_mutex_unlock( &p_input->stream.control.control_lock );
+
p_input->stream.i_new_status = UNDEF_S;
p_input->stream.i_new_rate = UNDEF_S;
}
/* We handle i_new_status != PAUSE_S below... */
- vlc_mutex_unlock( &p_input->stream.control.control_lock );
i_return_value = PAUSE_S;
}
p_input->stream.control.i_status = p_input->stream.i_new_status;
- ClockNewRef( p_input, p_pgrm, i_clock,
+ ClockNewRef( p_pgrm, i_clock,
ClockToSysdate( p_input, p_pgrm, i_clock ) );
if( p_input->stream.control.i_status == PLAYING_S )
void input_ClockManageRef( input_thread_t * p_input,
pgrm_descriptor_t * p_pgrm, mtime_t i_clock )
{
+ /* take selected program if none specified */
+ if( !p_pgrm )
+ {
+ p_pgrm = p_input->stream.p_selected_program;
+ }
+
if( ( p_pgrm->i_synchro_state != SYNCHRO_OK ) || ( i_clock == 0 ) )
{
/* Feed synchro with a new reference point. */
- ClockNewRef( p_input, p_pgrm, i_clock, mdate() );
+ ClockNewRef( p_pgrm, i_clock,
+ p_pgrm->last_pts + CR_MEAN_PTS_GAP > mdate() ?
+ p_pgrm->last_pts + CR_MEAN_PTS_GAP : mdate() );
p_pgrm->i_synchro_state = SYNCHRO_OK;
if( p_input->stream.b_pace_control
- && p_input->stream.pp_programs[0] == p_pgrm )
+ && p_input->stream.p_selected_program == p_pgrm )
{
p_pgrm->last_cr = i_clock;
mwait( ClockToSysdate( p_input, p_pgrm, i_clock ) );
/* Stream discontinuity, for which we haven't received a
* warning from the stream control facilities (dd-edited
* stream ?). */
- intf_WarnMsg( 1, "Clock gap, unexpected stream discontinuity" );
+ msg_Warn( p_input, "clock gap, unexpected stream discontinuity" );
input_ClockInit( p_pgrm );
p_pgrm->i_synchro_state = SYNCHRO_START;
- input_EscapeDiscontinuity( p_input, p_pgrm );
+ input_EscapeDiscontinuity( p_input );
}
p_pgrm->last_cr = i_clock;
if( p_input->stream.b_pace_control
- && p_input->stream.pp_programs[0] == p_pgrm )
+ && p_input->stream.p_selected_program == p_pgrm )
{
/* Wait a while before delivering the packets to the decoder.
* In case of multiple programs, we arbitrarily follow the
- * clock of the first program. */
+ * clock of the selected program. */
mwait( ClockToSysdate( p_input, p_pgrm, i_clock ) );
/* Now take into account interface changes. */
mtime_t input_ClockGetTS( input_thread_t * p_input,
pgrm_descriptor_t * p_pgrm, mtime_t i_ts )
{
+ /* take selected program if none specified */
+ if( !p_pgrm )
+ {
+ p_pgrm = p_input->stream.p_selected_program;
+ }
+
if( p_pgrm->i_synchro_state == SYNCHRO_OK )
{
- return( ClockToSysdate( p_input, p_pgrm, i_ts + p_pgrm->delta_cr )
- + DEFAULT_PTS_DELAY );
+ p_pgrm->last_pts = ClockToSysdate( p_input, p_pgrm,
+ i_ts + p_pgrm->delta_cr );
+ return( p_pgrm->last_pts + p_input->i_pts_delay );
}
else
{
projects / vlc / blobdiff