openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from OpenShot/bugfix/dont-remove-nearby-old-working-frame

Browse Source 
Don't remove nearby working frames
This commit is contained in:
Jonathan Thomas
2018-05-27 00:19:39 -05:00
committed by GitHub
parent a67583a2e1 a4c1b818ba
commit 704d9ea530
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/FFmpegReader.cpp
View File

@@ -1300,7 +1300,7 @@ void FFmpegReader::Seek(int64_t requested_frame)
seek_count++;
// If seeking near frame 1, we need to close and re-open the file (this is more reliable than seeking)
int buffer_amount = 8;
int buffer_amount = OPEN_MP_NUM_PROCESSORS * 2;
if (requested_frame - buffer_amount < 20)
{
// Close and re-open file (basically seeking to frame 1)
@@ -1649,7 +1649,6 @@ bool FFmpegReader::CheckMissingFrame(int64_t requested_frame)
// Debug output
ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::CheckMissingFrame", "requested_frame", requested_frame, "has_missing_frames", has_missing_frames, "missing_video_frames.size()", missing_video_frames.size(), "checked_count", checked_count, "", -1, "", -1);
// Missing frames (sometimes frame #'s are skipped due to invalid or missing timestamps)
map<int64_t, int64_t>::iterator itr;
bool found_missing_frame = false;
@@ -1731,7 +1730,7 @@ void FFmpegReader::CheckWorkingFrames(bool end_of_stream, int64_t requested_fram
break;
// Remove frames which are too old
if (f && f->number < requested_frame) {
if (f && f->number < (requested_frame - (OPEN_MP_NUM_PROCESSORS * 2))) {
working_cache.Remove(f->number);
}
@@ -1752,7 +1751,7 @@ void FFmpegReader::CheckWorkingFrames(bool end_of_stream, int64_t requested_fram
// Get check count for this frame
checked_frames_size = checked_frames.size();
if (!checked_count_tripped || f->number >= requested_frame)
checked_count = checked_frames[f->number];
checked_count = checked_frames[f->number];
else
// Force checked count over the limit
checked_count = max_checked_count;