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

ffmpegdecoder: mild code cleanup

Browse Source
This commit is contained in:
itsmattkc
2020-02-27 01:05:22 +11:00
parent 428cfc6210
commit 0fbffc9b8f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+12 -9
View File
@@ -36,6 +36,7 @@ extern "C" {
#include "codec/waveinput.h" #include "codec/waveinput.h"
#include "common/define.h" #include "common/define.h"
#include "common/filefunctions.h" #include "common/filefunctions.h"
#include "common/functiontimer.h"
#include "common/timecodefunctions.h" #include "common/timecodefunctions.h"
#include "ffmpegcommon.h" #include "ffmpegcommon.h"
#include "render/diskmanager.h" #include "render/diskmanager.h"
@@ -230,18 +231,21 @@ FramePtr FFmpegDecoder::RetrieveVideo(const rational &timecode)
// See if our RAM cache already has a frame that matches this timestamp // See if our RAM cache already has a frame that matches this timestamp
if (!cached_frames_.isEmpty()) { if (!cached_frames_.isEmpty()) {
if (cache_at_zero_ && target_ts < cached_frames_.first()->native_timestamp()) { if (target_ts < cached_frames_.first()->native_timestamp()) {
return_frame = cached_frames_.first(); if (cache_at_zero_) {
cached_frames_.accessedFirst(); return_frame = cached_frames_.first();
cached_frames_.accessedFirst();
}
} else if (cache_at_eof_ && target_ts > cached_frames_.last()->native_timestamp()) { } else if (target_ts > cached_frames_.last()->native_timestamp()) {
return_frame = cached_frames_.last(); if (cache_at_eof_) {
cached_frames_.accessedLast(); return_frame = cached_frames_.last();
cached_frames_.accessedLast();
}
} else if (target_ts >= cached_frames_.first()->native_timestamp() } else {
&& target_ts <= cached_frames_.last()->native_timestamp()) {
// We already have this frame in the cache, find it // We already have this frame in the cache, find it
for (int i=0;i<cached_frames_.size();i++) { for (int i=0;i<cached_frames_.size();i++) {
@@ -288,7 +292,6 @@ FramePtr FFmpegDecoder::RetrieveVideo(const rational &timecode)
// If we have no disk cache, we'll need to find this frame ourselves // If we have no disk cache, we'll need to find this frame ourselves
if (!return_frame) { if (!return_frame) {
int64_t seek_ts = target_ts; int64_t seek_ts = target_ts;
bool still_seeking = false; bool still_seeking = false;