Skip to content

V
vlc-1.1
Commit 24e0e49b authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/demux/ogg.c: small bug-fix for my previous commit.
parent 4b8e273c
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
modules/demux/ogg.c
View file @ 24e0e49b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ogg.c : ogg stream input module for vlc * ogg.c : ogg stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: ogg.c,v 1.11 2002/11/21 09:39:39 gbazin Exp $ * $Id: ogg.c,v 1.12 2002/11/21 10:12:34 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -339,12 +339,11 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream, ...@@ -339,12 +339,11 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream,
else else
p_stream->i_pcr = -1; p_stream->i_pcr = -1;
/* no granulepos available, try to interpolate the pcr */ /* no granulepos available, try to interpolate the pcr.
* If we can't then don't touch the old value. */
if( p_stream->i_bitrate ) if( p_stream->i_bitrate )
p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000 p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000
/ p_stream->i_bitrate / 8 ); / p_stream->i_bitrate / 8 );
else
p_stream->i_interpolated_pcr = -1;
} }
} }
...@@ -1133,14 +1132,14 @@ static int Demux( input_thread_t * p_input ) ...@@ -1133,14 +1132,14 @@ static int Demux( input_thread_t * p_input )
} }
} }
p_ogg->i_pcr = INT_MAX; i_stream = 0;
for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ ) p_ogg->i_pcr = p_stream->i_interpolated_pcr;
for( ; i_stream < p_ogg->i_streams; i_stream++ )
{ {
if( p_stream->i_cat == SPU_ES ) if( p_stream->i_cat == SPU_ES )
continue; continue;
if( p_stream->i_interpolated_pcr >= 0 && if( p_stream->i_interpolated_pcr < p_ogg->i_pcr )
p_stream->i_interpolated_pcr < p_ogg->i_pcr )
p_ogg->i_pcr = p_stream->i_interpolated_pcr; p_ogg->i_pcr = p_stream->i_interpolated_pcr;
} }
#undef p_stream #undef p_stream
......
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