Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally: Seeking audio in MKV files works when seeking the 

muxer by the "default" stream. When I previously tried this,
I mistakenly remembered AV_TIME_BASE to be 1000, but it's
1000000, the same as the native bigtime_t time representation.
Luckily, we can still set all other streams (including the
"default" stream) to be discarded when obtaining chunks
packets.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38677 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-09-16 15:13:24 +00:00
parent 91debc877a
commit 7b61b6b8e4
1 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
View File

@ -869,31 +869,9 @@ AVFormatReader::StreamCookie::Seek(uint32 flags, int64* frame,
if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0) if ((flags & B_MEDIA_SEEK_TO_FRAME) != 0)
*time = (bigtime_t)(*frame * 1000000.0 / frameRate + 0.5); *time = (bigtime_t)(*frame * 1000000.0 / frameRate + 0.5);
#if 0 int64_t timeStamp = *time;
// This happens in ffplay.c: int64_t minTimeStamp = timeStamp - 1000000;
int64_t maxTimeStamp = timeStamp + 1000000;
int64_t pos = get_master_clock(cur_stream);
// The master clock seems to be the current system time
// with an offset for the current PTS value of the respective
// stream.
pos += incr;
// depends on the seek direction...
pos = (int64_t)(pos * AV_TIME_BASE);
uint32_t seekFlags = incr < 0 ? AVSEEK_FLAG_BACKWARD : 0;
pos = av_rescale_q(pos, AV_TIME_BASE_Q, fStream->time_base);
ret = av_seek_frame(fContext, Index(), pos, seekFlags);
#endif
#if 0
int streamIndex = -1;
int64_t timeStamp = *time / AV_TIME_BASE;
#else
int streamIndex = Index();
int64_t timeStamp = _ConvertToStreamTimeBase(*time);
#endif
TRACE_SEEK(" time: %.5fs -> %lld, current DTS: %lld (time_base: %d/%d)\n", TRACE_SEEK(" time: %.5fs -> %lld, current DTS: %lld (time_base: %d/%d)\n",
*time / 1000000.0, timeStamp, fStream->cur_dts, fStream->time_base.num, *time / 1000000.0, timeStamp, fStream->cur_dts, fStream->time_base.num,
@ -903,21 +881,11 @@ AVFormatReader::StreamCookie::Seek(uint32 flags, int64* frame,
if ((flags & B_MEDIA_SEEK_CLOSEST_FORWARD) != 0) if ((flags & B_MEDIA_SEEK_CLOSEST_FORWARD) != 0)
searchFlags = 0; searchFlags = 0;
#if 0 if (avformat_seek_file(fContext, -1, minTimeStamp, timeStamp,
bigtime_t oneSecond = 1000000;
int64_t minTimeStamp = timeStamp - _ConvertToStreamTimeBase(oneSecond);
int64_t maxTimeStamp = timeStamp + _ConvertToStreamTimeBase(oneSecond);
if (avformat_seek_file(fContext, streamIndex, minTimeStamp, timeStamp,
maxTimeStamp, searchFlags) < 0) { maxTimeStamp, searchFlags) < 0) {
TRACE_SEEK(" avformat_seek_file() failed.\n"); TRACE_SEEK(" avformat_seek_file() failed.\n");
return B_ERROR; return B_ERROR;
} }
#else
if (av_seek_frame(fContext, streamIndex, timeStamp, searchFlags) < 0) {
printf(" av_seek_frame() failed.\n");
return B_ERROR;
}
#endif
// Our last packet is toast in any case. Read the next one so we // Our last packet is toast in any case. Read the next one so we
// know where we really seeked. // know where we really seeked.