Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2010-11-01 21:13:10 +0300
committerPeter Schlaile <peter@schlaile.de>2010-11-01 21:13:10 +0300
commit1b18ea58239b39538f1947cbc1ee0fba9cd26dd9 (patch)
treef500002e9a1ef2f4910fb24bf9c0315f21506e13 /intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
parent3a8c37bb240f9226526b70165c04c911ed4d3c14 (diff)
== FFMPEG ==
This fixes a rather subtle seeking issue with ffmpeg and Sony XDCAM-footage. Problem is: MPEG2 streams within an MP4 container can contain a start time - at several places. There is a starttime within the video and audio streams and one within the container. FFMpeg commandline tool only uses the container starttime and we used the stream starttime. The world would be a better place, if those two timestamps always match up, since in XDCAM-footage those two starttimes differ in 4 frames - and the container has the right one. We now always use the container start time as ffmpeg commandline tool does (in the hope, that there is a good explaination for this and this is the right thing(tm) to do). I tested this also with HDV footage, which seems to work with the new code, too. Additional fix: disabled seek_by_bytes again, since it will only work correctly, if ffmpeg guessed the HDV bitrate right (which it doesn't). If you have seeking issues with HDV and have an older version of ffmpeg installed, please upgrade, newer versions have some fixes in them.
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp')
-rw-r--r--intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
index 09fdb31e938..5526b0dcf5a 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
@@ -246,10 +246,8 @@ void AUD_FFMPEGReader::seek(int position)
{
if(position >= 0)
{
- uint64_t st_time = m_formatCtx->streams[m_stream]->start_time;
- double time_base =
- av_q2d(m_formatCtx->streams[m_stream]->time_base);
- uint64_t seek_pos = position / time_base / m_specs.rate;
+ uint64_t st_time = m_formatCtx->start_time;
+ uint64_t seek_pos = position * AV_TIME_BASE / m_specs.rate;
if (seek_pos < 0) {
seek_pos = 0;
@@ -259,9 +257,14 @@ void AUD_FFMPEGReader::seek(int position)
seek_pos += st_time;
}
+ double pts_time_base =
+ av_q2d(m_formatCtx->streams[m_stream]->time_base);
+ uint64_t pts_st_time =
+ ((st_time != AV_NOPTS_VALUE) ? st_time : 0)
+ / pts_time_base / (uint64_t) AV_TIME_BASE;
// a value < 0 tells us that seeking failed
- if(av_seek_frame(m_formatCtx, m_stream, seek_pos,
+ if(av_seek_frame(m_formatCtx, -1, seek_pos,
AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
{
avcodec_flush_buffers(m_codecCtx);
@@ -284,7 +287,7 @@ void AUD_FFMPEGReader::seek(int position)
{
// calculate real position, and read to frame!
m_position = (packet.pts -
- ((st_time != AV_NOPTS_VALUE) ? st_time : 0)) * time_base * m_specs.rate;
+ pts_st_time) * pts_time_base * m_specs.rate;
if(m_position < position)
{
@@ -307,6 +310,7 @@ void AUD_FFMPEGReader::seek(int position)
}
else
{
+ fprintf(stderr, "seeking failed!\n");
// Seeking failed, do nothing.
}
}