Commit 991b8fc1 authored by Christophe Massiot's avatar Christophe Massiot
Browse files

* We can now seek at position 0 :p ;

* Fixed a typo in my previous commit.
parent 509d5ac4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input.h: structures of the input not exported to other modules * input.h: structures of the input not exported to other modules
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: input.h,v 1.28 2001/02/08 17:44:12 massiot Exp $ * $Id: input.h,v 1.29 2001/02/12 13:20:14 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
* of data loss (this should be < 188). */ * of data loss (this should be < 188). */
#define PADDING_PACKET_NUMBER 10 /* Number of padding packets top insert to #define PADDING_PACKET_NUMBER 10 /* Number of padding packets top insert to
* escape a decoder. */ * escape a decoder. */
#define NO_SEEK -1
/***************************************************************************** /*****************************************************************************
* Prototypes from input_ext-dec.c * Prototypes from input_ext-dec.c
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.79 2001/02/11 01:15:11 sam Exp $ * $Id: input.c,v 1.80 2001/02/12 13:20:14 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -105,7 +105,7 @@ input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status ) ...@@ -105,7 +105,7 @@ input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status )
p_input->stream.i_selected_es_number = 0; p_input->stream.i_selected_es_number = 0;
p_input->stream.i_pgrm_number = 0; p_input->stream.i_pgrm_number = 0;
p_input->stream.i_new_status = p_input->stream.i_new_rate = 0; p_input->stream.i_new_status = p_input->stream.i_new_rate = 0;
p_input->stream.i_seek = 0; p_input->stream.i_seek = NO_SEEK;
/* Initialize stream control properties. */ /* Initialize stream control properties. */
p_input->stream.control.i_status = PLAYING_S; p_input->stream.control.i_status = PLAYING_S;
...@@ -198,7 +198,7 @@ static void RunThread( input_thread_t *p_input ) ...@@ -198,7 +198,7 @@ static void RunThread( input_thread_t *p_input )
#endif #endif
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
if( p_input->stream.i_seek ) if( p_input->stream.i_seek != NO_SEEK )
{ {
if( p_input->stream.b_seekable && p_input->pf_seek != NULL ) if( p_input->stream.b_seekable && p_input->pf_seek != NULL )
{ {
...@@ -216,7 +216,7 @@ static void RunThread( input_thread_t *p_input ) ...@@ -216,7 +216,7 @@ static void RunThread( input_thread_t *p_input )
p_pgrm->i_synchro_state = SYNCHRO_REINIT; p_pgrm->i_synchro_state = SYNCHRO_REINIT;
} }
} }
p_input->stream.i_seek = 0; p_input->stream.i_seek = NO_SEEK;
} }
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vpar_synchro.c : frame dropping routines * vpar_synchro.c : frame dropping routines
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_synchro.c,v 1.83 2001/02/12 11:22:31 massiot Exp $ * $Id: vpar_synchro.c,v 1.84 2001/02/12 13:20:15 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -583,7 +583,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type, ...@@ -583,7 +583,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
if( p_vpar->synchro.backward_pts + DEFAULT_PTS_DELAY < now ) if( p_vpar->synchro.backward_pts + DEFAULT_PTS_DELAY < now )
{ {
/* The same. */ /* The same. */
p_vpar->synchro.current_pts = 0; p_vpar->synchro.backward_pts = 0;
} }
#ifdef STATS #ifdef STATS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment