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

Moving omp taskwait to after the ProcessVideoPacket() method, since that is the only place it is useful.

Browse Source
This commit is contained in:
Jonathan Thomas
2018-08-12 00:36:03 -05:00
parent 8216795c33
commit 6b5e2d427b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/FFmpegReader.cpp
View File

@@ -607,6 +607,12 @@ std::shared_ptr<Frame> FFmpegReader::ReadStream(int64_t requested_frame)
// Process Video Packet
ProcessVideoPacket(requested_frame);
if (!use_omp_threads) {
// Wait on each OMP task to complete before moving on to the next one. This slows
// down processing considerably, but might be more stable on some systems.
#pragma omp taskwait
}
}
}
@@ -638,12 +644,6 @@ std::shared_ptr<Frame> FFmpegReader::ReadStream(int64_t requested_frame)
ProcessAudioPacket(requested_frame, location.frame, location.sample_start);
}
if (!use_omp_threads) {
// Wait on each OMP task to complete before moving on to the next one. This slows
// down processing considerably, but might be more stable on some systems.
#pragma omp taskwait
}
// Check if working frames are 'finished'
if (!is_seeking) {
// Check for any missing frames