i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FFMPEG Plugin: Fix video start_time generation.

Browse Source 
- Ensure that start times are increased monotonically for video formats that
  contain B-frames, too, as expected by the BMediaDecoders.
  Previously start times were returned that seemed to go back in time for
  videos containing B-frames.
  Tested with resolutionchange.mpg (\see http://samples.ffmpeg.org/MPEG2)
  Note: Even though start times aren't going back in time anymore there are
  times where two consecutive start times are equal. This would need more
  research once this exposes a bug in a real application. Further more this
  might seem like a new bug, but before this commit the equal start times would
  have simply some different start time[s] in between. So at most this is the
  same bug just wearing new clothes :)

- Documentation updated accordingly.
This commit is contained in:
Colin Günther
2014-08-10 14:51:15 +02:00
parent ed9de7dfca
commit 676721d267
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
+16 -12
View File
@@ -701,18 +701,22 @@ StreamBase::GetNextChunk(const void** chunkBuffer,
mediaHeader->destination = -1;
mediaHeader->time_source = -1;
mediaHeader->size_used = fPacket.size;
if (fPacket.pts != kNoPTSValue) {
//TRACE(" PTS: %lld (time_base.num: %d, .den: %d), stream DTS: %lld\n",
//fPacket.pts, fStream->time_base.num, fStream->time_base.den,
//fStream->cur_dts);
mediaHeader->start_time = _ConvertFromStreamTimeBase(fPacket.pts);
} else {
//TRACE(" PTS (stream): %lld (time_base.num: %d, .den: %d), stream DTS: %lld\n",
//lastStreamDTS, fStream->time_base.num, fStream->time_base.den,
//fStream->cur_dts);
mediaHeader->start_time
= _ConvertFromStreamTimeBase(lastStreamDTS);
}
// FFmpeg recommends to use the decoding time stamps as primary source
// for presentation time stamps, especially for video formats that are
// using frame reordering. More over this way it is ensured that the
// returned start times are ordered in a monotonically increasing time
// series (even for videos that contain B-frames).
// \see http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavformat/avformat.h;h=1e8a6294890d580cd9ebc684eaf4ce57c8413bd8;hb=9153b33a742c4e2a85ff6230aea0e75f5a8b26c2#l1623
bigtime_t presentationTimeStamp;
if (fPacket.dts != kNoPTSValue)
presentationTimeStamp = fPacket.dts;
else if (fPacket.pts != kNoPTSValue)
presentationTimeStamp = fPacket.pts;
else
presentationTimeStamp = lastStreamDTS;
mediaHeader->start_time = _ConvertFromStreamTimeBase(presentationTimeStamp);
mediaHeader->file_pos = fPacket.pos;
mediaHeader->data_offset = 0;
switch (mediaHeader->type) {