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

Cleaned up timeline class a bit, and refactored some OpenMP multi-threading support. The timeline GetFrame() method can not fully support OpenMP at the moment, due to nested parallel regions in some conditional ImageMagick function calls. Also better protected the openshot::Clip.GetFrame() call.

Browse Source
This commit is contained in:
Jonathan Thomas
2015-03-15 02:28:28 -05:00
parent b07936e3b2
commit 88e65fecef
5 changed files with 157 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Clip.cpp
View File

@@ -237,7 +237,7 @@ tr1::shared_ptr<Frame> Clip::GetFrame(int requested_frame) throw(ReaderClosed)
// Now that we have re-mapped what frame number is needed, go and get the frame pointer
tr1::shared_ptr<Frame> original_frame = reader->GetFrame(new_frame_number);
tr1::shared_ptr<Frame> original_frame = reader->GetFrameSafe(new_frame_number);
// Create a new frame
tr1::shared_ptr<Frame> frame(new Frame(new_frame_number, 1, 1, "#000000", original_frame->GetAudioSamplesCount(), original_frame->GetAudioChannelsCount()));