/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include "input_internal.h"
*****************************************************************************/
/* Maximum gap allowed between two CRs. */
-#define CR_MAX_GAP (I64C(2000000)*100/9)
+#define CR_MAX_GAP (INT64_C(2000000)*100/9)
/* Latency introduced on DVDs with CR == 0 on chapter change - this is from
* my dice --Meuuh */
* input_ClockInit: reinitializes the clock reference after a stream
* discontinuity
*****************************************************************************/
-void input_ClockInit( input_thread_t *p_input,
- input_clock_t *cl, vlc_bool_t b_master, int i_cr_average )
+void input_ClockInit( input_clock_t *cl, bool b_master, int i_cr_average, int i_rate )
{
cl->i_synchro_state = SYNCHRO_START;
cl->sysdate_ref = 0;
cl->delta_cr = 0;
cl->i_delta_cr_residue = 0;
- cl->i_rate = p_input->p->i_rate;
+ cl->i_rate = i_rate;
cl->i_cr_average = i_cr_average;
void input_ClockSetPCR( input_thread_t *p_input,
input_clock_t *cl, mtime_t i_clock )
{
- const vlc_bool_t b_synchronize = p_input->b_can_pace_control && cl->b_master;
+ const bool b_synchronize = p_input->b_can_pace_control && cl->b_master;
const mtime_t i_mdate = mdate();
if( ( cl->i_synchro_state != SYNCHRO_OK ) ||
* warning from the stream control facilities (dd-edited
* stream ?). */
msg_Warn( p_input, "clock gap, unexpected stream discontinuity" );
- input_ClockInit( p_input, cl, cl->b_master, cl->i_cr_average );
+ input_ClockInit( cl, cl->b_master, cl->i_cr_average, cl->i_rate );
+ /* Feed synchro with a new reference point. */
+ msg_Warn( p_input, "feeding synchro with a new reference point trying to recover from clock gap" );
+ ClockNewRef( cl, i_clock,
+ __MAX( cl->last_pts + CR_MEAN_PTS_GAP, i_mdate ) );
+ cl->i_synchro_state = SYNCHRO_OK;
}
cl->last_cr = i_clock;
/*****************************************************************************
* input_ClockResetPCR:
*****************************************************************************/
-void input_ClockResetPCR( input_thread_t * p_input, input_clock_t *cl )
+void input_ClockResetPCR( input_clock_t *cl )
{
cl->i_synchro_state = SYNCHRO_REINIT;
cl->last_pts = 0;
/*****************************************************************************
* input_ClockSetRate:
*****************************************************************************/
-void input_ClockSetRate( input_thread_t *p_input, input_clock_t *cl )
+void input_ClockSetRate( input_clock_t *cl, int i_rate )
{
/* Move the reference point */
if( cl->i_synchro_state == SYNCHRO_OK )
ClockNewRef( cl, cl->last_cr, cl->last_sysdate );
- cl->i_rate = p_input->p->i_rate;
+ cl->i_rate = i_rate;
}