oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpegdecoder: factor in AVFormatContext::start_time

Browse Source
This commit is contained in:
itsmattkc
2022-10-11 00:25:56 -07:00
parent 01874ba786
commit 202342e24f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+8 -4
View File
@@ -312,9 +312,11 @@ void FFmpegDecoder::CloseInternal()
rational FFmpegDecoder::GetAudioStartOffset() const rational FFmpegDecoder::GetAudioStartOffset() const
{ {
AVStream *s = this->instance_.avstream(); auto f = instance_.fmt_ctx();
if (s) { if (f) {
return rational(s->start_time * s->time_base.num, s->time_base.den); rational fmt_start = rational(instance_.fmt_ctx()->start_time, AV_TIME_BASE);
rational str_start = rational(instance_.avstream()->time_base) * instance_.avstream()->start_time;
return str_start - fmt_start;
} else { } else {
return 0; return 0;
} }
@@ -804,7 +806,9 @@ AVFramePtr FFmpegDecoder::RetrieveFrame(const rational& time, VideoParams::Inter
target_ts *= 2; target_ts *= 2;
} }
target_ts += instance_.avstream()->start_time; if (instance_.fmt_ctx()->start_time != AV_NOPTS_VALUE) {
target_ts += av_rescale_q(instance_.fmt_ctx()->start_time, AV_TIME_BASE_Q, instance_.avstream()->time_base);
}
const int64_t min_seek = 0; const int64_t min_seek = 0;
int64_t seek_ts = std::max(min_seek, target_ts - MaximumQueueSize()); int64_t seek_ts = std::max(min_seek, target_ts - MaximumQueueSize());