From 4c1d47718034a807e1aabc72eaf3d21a4a46e6c2 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Tue, 17 Sep 2013 10:50:38 +0200
Subject: [PATCH] demux: ogg: don't try seeking using bitrate if incomplete.
Results in wrong position if only one track has bitrate info.
---
modules/demux/ogg.c | 9 +++++++--
modules/demux/ogg.h | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 81fb2deb4554..d6ced6296188 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -571,7 +571,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
Ogg_ResetStreamHelper( p_sys );
- if ( p_sys->i_bitrate == 0 )
+ if ( p_sys->i_bitrate == 0 || p_sys->b_partial_bitrate )
{
/* we won't be able to find block by time
* we'll need to bisect search from here
@@ -1653,7 +1653,12 @@ static int Ogg_BeginningOfStream( demux_t *p_demux )
es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
}
- p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
+ if ( p_stream->fmt.i_bitrate == 0 &&
+ ( p_stream->fmt.i_cat == VIDEO_ES ||
+ p_stream->fmt.i_cat == AUDIO_ES ) )
+ p_ogg->b_partial_bitrate = true;
+ else
+ p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
p_stream->i_pcr = p_stream->i_previous_pcr =
p_stream->i_interpolated_pcr = -1;
diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index cc3e54c3f768..606282c43328 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -102,6 +102,7 @@ struct demux_sys_t
/* bitrate */
int i_bitrate;
+ bool b_partial_bitrate;
/* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */
bool b_page_waiting;
--
GitLab