From d3aacbfc77df232006a4a65f398929e9651cf1fb Mon Sep 17 00:00:00 2001 From: Henri Fallon Date: Sat, 28 Apr 2001 23:19:19 +0000 Subject: [PATCH] - Fixed a bug in TS input. It should be more smooth now - Fixed the pace control. Meuuh, could you check ? --- src/input/input.c | 4 ++-- src/input/input_clock.c | 6 +++--- src/input/input_netlist.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/input/input.c b/src/input/input.c index e923239acc..1c29372b65 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -4,7 +4,7 @@ * decoders. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input.c,v 1.102 2001/04/28 03:36:25 sam Exp $ + * $Id: input.c,v 1.103 2001/04/28 23:19:19 henri Exp $ * * Authors: Christophe Massiot * @@ -686,7 +686,7 @@ void input_NetworkOpen( input_thread_t * p_input ) /* We can't pace control, but FIXME : bug in meuuh's code to sync PCR * with the server. */ - p_input->stream.b_pace_control = 1; + p_input->stream.b_pace_control = 0; p_input->stream.b_seekable = 0; return; diff --git a/src/input/input_clock.c b/src/input/input_clock.c index 20b4d74531..d44ee411f0 100644 --- a/src/input/input_clock.c +++ b/src/input/input_clock.c @@ -2,7 +2,7 @@ * input_clock.c: Clock/System date convertions, stream management ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_clock.c,v 1.11 2001/04/28 03:36:25 sam Exp $ + * $Id: input_clock.c,v 1.12 2001/04/28 23:19:19 henri Exp $ * * Authors: Christophe Massiot * @@ -244,14 +244,14 @@ void input_ClockManageRef( input_thread_t * p_input, { p_pgrm->delta_cr = ( p_pgrm->delta_cr * (CR_MAX_AVERAGE_COUNTER - 1) - + i_extrapoled_clock ) + + ( i_extrapoled_clock - i_clock ) ) / CR_MAX_AVERAGE_COUNTER; } else { p_pgrm->delta_cr = ( p_pgrm->delta_cr * p_pgrm->c_average_count - + i_extrapoled_clock ) + + ( i_extrapoled_clock - i_clock ) ) / (p_pgrm->c_average_count + 1); p_pgrm->c_average_count++; } diff --git a/src/input/input_netlist.c b/src/input/input_netlist.c index a685c7b324..b5aafe0519 100644 --- a/src/input/input_netlist.c +++ b/src/input/input_netlist.c @@ -2,7 +2,7 @@ * input_netlist.c: netlist management ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: input_netlist.c,v 1.34 2001/04/28 03:36:25 sam Exp $ + * $Id: input_netlist.c,v 1.35 2001/04/28 23:19:19 henri Exp $ * * Authors: Henri Fallon * @@ -259,6 +259,7 @@ while (i_loop < i_nb_iovec ) i_current-=p_netlist->i_nb_data; pp_packets[i_loop] = p_netlist->pp_free_data[i_current]; + pp_packets[i_loop]->b_discard_payload = 0; i_loop ++; i_current ++; -- 2.39.5