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

Made CheckSeek() threadsafe

Browse Source
This commit is contained in:
Jonathan Thomas
2012-07-03 02:59:38 -05:00
parent a662abcfd7
commit 6553f49874
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/FFmpegReader.cpp
View File

@@ -273,6 +273,7 @@ Frame FFmpegReader::ReadStream(int requested_frame)
{
// Allocate video frame
bool end_of_stream = false;
bool check_seek = false;
#pragma omp parallel
{
@@ -293,7 +294,10 @@ Frame FFmpegReader::ReadStream(int requested_frame)
if (packet->stream_index == videoStream)
{
// Check the status of a seek (if any)
if (CheckSeek(true))
#pragma omp critical (openshot_cache)
check_seek = CheckSeek(true);
if (check_seek)
// Jump to the next iteration of this loop
continue;
@@ -316,7 +320,10 @@ Frame FFmpegReader::ReadStream(int requested_frame)
cout << "AUDIO PACKET (PTS: " << packet->pts << ")" << endl;
// Check the status of a seek (if any)
if (CheckSeek(false))
#pragma omp critical (openshot_cache)
check_seek = CheckSeek(false);
if (check_seek)
// Jump to the next iteration of this loop
continue;