From 78a42a038b945c0404ac4e7c3ccd58eb0105067a Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 17 Mar 2015 13:41:16 +0000 Subject: [PATCH] Revert "MKV: Always set an i_pts in a lace otherwise it disturbs seeking performance" This reverts commit 6a16055a3331a4022d12ba29ab002a3257e4c89c. Fixes #14194 Vorbis doesn't work properly with forced bogus PTS. The seek issue in #13575 is solved with the DirectSound fixes from #14186 Signed-off-by: Jean-Baptiste Kempf --- modules/demux/mkv/mkv.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index 5cace0a984..362cd4f180 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -719,8 +719,10 @@ msg_Dbg( p_demux, "block (track=%d) i_dts: %"PRId64" / i_pts: %"PRId64, tk->i_nu es_out_Send( p_demux->out, tk->p_es, p_block ); - // prepare the pts for the next frame in the lace - i_pts += tk->i_default_duration ? tk->i_default_duration : 1; + /* use time stamp only for first block */ + i_pts = ( tk->i_default_duration )? + i_pts + ( mtime_t )tk->i_default_duration: + VLC_TS_INVALID; } } -- 2.39.2