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 #751 from OpenShot/prevent-cache-crash

Browse Source 
Prevent crash when smallest frame detected in memory object is NULL
This commit is contained in:
Jonathan Thomas
2021-10-08 16:01:14 -05:00
committed by GitHub
parent ce8b08238c 2e8c74e8aa
commit 4c171cc15c
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CacheDisk.cpp
View File

@@ -294,7 +294,6 @@ std::shared_ptr<Frame> CacheDisk::GetSmallestFrame()
{
// Create a scoped lock, to protect the cache from multiple threads
const GenericScopedLock<CriticalSection> lock(*cacheCriticalSection);
std::shared_ptr<openshot::Frame> f;
// Loop through frame numbers
std::deque<int64_t>::iterator itr;
@@ -305,10 +304,12 @@ std::shared_ptr<Frame> CacheDisk::GetSmallestFrame()
smallest_frame = *itr;
}
// Return frame
f = GetFrame(smallest_frame);
return f;
// Return frame (if any)
if (smallest_frame != -1) {
return GetFrame(smallest_frame);
} else {
return NULL;
}
}
// Gets the maximum bytes value

11
src/CacheMemory.cpp
View File

@@ -168,7 +168,6 @@ std::shared_ptr<Frame> CacheMemory::GetSmallestFrame()
{
// Create a scoped lock, to protect the cache from multiple threads
const GenericScopedLock<CriticalSection> lock(*cacheCriticalSection);
std::shared_ptr<openshot::Frame> f;
// Loop through frame numbers
std::deque<int64_t>::iterator itr;
@@ -179,10 +178,12 @@ std::shared_ptr<Frame> CacheMemory::GetSmallestFrame()
smallest_frame = *itr;
}
// Return frame
f = GetFrame(smallest_frame);
return f;
// Return frame (if any)
if (smallest_frame != -1) {
return GetFrame(smallest_frame);
} else {
return NULL;
}
}
// Gets the maximum bytes value

13
src/Qt/VideoCacheThread.cpp
View File

@@ -86,6 +86,7 @@ namespace openshot
void VideoCacheThread::run()
{
// Types for storing time durations in whole and fractional milliseconds
std::shared_ptr<openshot::Frame> smallest_frame = NULL;
using ms = std::chrono::milliseconds;
using double_ms = std::chrono::duration<double, ms::period>;
@@ -107,13 +108,11 @@ namespace openshot
ZmqLogger::Instance()->AppendDebugMethod("VideoCacheThread::run (cache frame)", "position", position, "current_display_frame", current_display_frame, "max_concurrent_frames", max_concurrent_frames, "needed_frames", (position - current_display_frame));
// Force the frame to be generated
if (reader->GetCache()->GetSmallestFrame()) {
int64_t smallest_cached_frame = reader->GetCache()->GetSmallestFrame()->number;
if (smallest_cached_frame > current_display_frame) {
// Cache position has gotten too far away from current display frame.
// Reset the position to the current display frame.
position = current_display_frame;
}
smallest_frame = reader->GetCache()->GetSmallestFrame();
if (smallest_frame && smallest_frame->number > current_display_frame) {
// Cache position has gotten too far away from current display frame.
// Reset the position to the current display frame.
position = current_display_frame;
}
reader->GetFrame(position);
}