From 67e19f8ad7e7a600d697e155f58cfe7784657060 Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Sun, 13 Nov 2005 18:32:16 +0000 Subject: [PATCH] backport [13191] and [13192] once again --- modules/demux/mpeg/mpga.c | 2 +- src/input/clock.c | 5 ++++- src/input/input_internal.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c index fefc4299a7..f7bcbf9127 100644 --- a/modules/demux/mpeg/mpga.c +++ b/modules/demux/mpeg/mpga.c @@ -32,7 +32,7 @@ #include "vlc_codec.h" #include "vlc_meta.h" -#define MPGA_PACKET_SIZE 4096 +#define MPGA_PACKET_SIZE 1024 /***************************************************************************** * Module descriptor diff --git a/src/input/clock.c b/src/input/clock.c index 6afca87a61..3e5fd1bd96 100644 --- a/src/input/clock.c +++ b/src/input/clock.c @@ -133,6 +133,7 @@ void input_ClockInit( input_clock_t *cl, vlc_bool_t b_master, int i_cr_average ) cl->last_cr = 0; cl->last_pts = 0; + cl->last_sysdate = 0; cl->cr_ref = 0; cl->sysdate_ref = 0; cl->delta_cr = 0; @@ -264,6 +265,7 @@ void input_ClockSetPCR( input_thread_t *p_input, else { cl->last_cr = 0; + cl->last_sysdate = 0; cl->delta_cr = 0; cl->i_delta_cr_residue = 0; } @@ -308,7 +310,7 @@ void input_ClockSetPCR( input_thread_t *p_input, input_ClockManageControl( p_input, cl, i_clock ); #endif } - else + else if ( mdate() - cl->last_sysdate > 200000 ) { /* Smooth clock reference variations. */ mtime_t i_extrapoled_clock = ClockCurrent( p_input, cl ); @@ -324,6 +326,7 @@ void input_ClockSetPCR( input_thread_t *p_input, + cl->i_delta_cr_residue ) % cl->i_cr_average; cl->delta_cr = delta_cr; + cl->last_sysdate = mdate(); } } } diff --git a/src/input/input_internal.h b/src/input/input_internal.h index a9a0b3fe78..c0daa4d8d5 100644 --- a/src/input/input_internal.h +++ b/src/input/input_internal.h @@ -133,6 +133,7 @@ typedef struct /* Synchronization information */ mtime_t delta_cr; mtime_t cr_ref, sysdate_ref; + mtime_t last_sysdate; mtime_t last_cr; /* reference to detect unexpected stream * discontinuities */ mtime_t last_pts; -- 2.39.2