/*****************************************************************************
* input_clock.c: Clock/System date convertions, stream management
*****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_clock.c,v 1.23 2001/11/08 14:45:44 stef Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: input_clock.c,v 1.29 2002/03/05 17:46:33 stef 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 <videolan/vlc.h>
#include "stream_control.h"
#include "input_ext-intf.h"
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. */
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 ) );
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 )
{
/* We remember the last system date to be able to restart
* the synchro we statistically better continuity, after
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 );
+ + DEFAULT_PTS_DELAY
+ + (p_main->i_desync > 0 ? p_main->i_desync : 0) );
}
else
{