Merge branch 'develop' into release

Author: jonoomph

include/Version.h

@@ -35,9 +35,9 @@
 #endif
 
 #define OPENSHOT_VERSION_MAJOR 0;   /// Major version number is incremented when huge features are added or improved.
-#define OPENSHOT_VERSION_MINOR 2;   /// Minor version is incremented when smaller (but still very important) improvements are added.
-#define OPENSHOT_VERSION_BUILD 0;   /// Build number is incremented when minor bug fixes and less important improvements are added.
-#define OPENSHOT_VERSION_SO 15;     /// Shared object version number. This increments any time the API and ABI changes (so old apps will no longer link)
+#define OPENSHOT_VERSION_MINOR 1;   /// Minor version is incremented when smaller (but still very important) improvements are added.
+#define OPENSHOT_VERSION_BUILD 9;   /// Build number is incremented when minor bug fixes and less important improvements are added.
+#define OPENSHOT_VERSION_SO 14;     /// Shared object version number. This increments any time the API and ABI changes (so old apps will no longer link)
 #define OPENSHOT_VERSION_MAJOR_MINOR STRINGIZE(OPENSHOT_VERSION_MAJOR) "." STRINGIZE(OPENSHOT_VERSION_MINOR); /// A string of the "Major.Minor" version
 #define OPENSHOT_VERSION_ALL STRINGIZE(OPENSHOT_VERSION_MAJOR) "." STRINGIZE(OPENSHOT_VERSION_MINOR) "." STRINGIZE(OPENSHOT_VERSION_BUILD); /// A string of the entire version "Major.Minor.Build"
 

src/FFmpegReader.cpp

@@ -466,55 +466,55 @@ std::shared_ptr<Frame> FFmpegReader::GetFrame(int64_t requested_frame)
 	}
 	else
 	{
-		// Create a scoped lock, allowing only a single thread to run the following code at one time
-		const GenericScopedLock<CriticalSection> lock(getFrameCriticalSection);
-
-		// Check the cache a 2nd time (due to a potential previous lock)
-		if (has_missing_frames)
-		    CheckMissingFrame(requested_frame);
-		frame = final_cache.GetFrame(requested_frame);
-		if (frame) {
-			// Debug output
-			ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::GetFrame", "returned cached frame on 2nd look", requested_frame, "", -1, "", -1, "", -1, "", -1, "", -1);
-
-			// Return the cached frame
-			return frame;
-		}
-
-		// Frame is not in cache
-		// Reset seek count
-		seek_count = 0;
-
-		// Check for first frame (always need to get frame 1 before other frames, to correctly calculate offsets)
-		if (last_frame == 0 && requested_frame != 1)
-			// Get first frame
-			ReadStream(1);
-
-		// Are we within X frames of the requested frame?
-		int64_t diff = requested_frame - last_frame;
-		if (diff >= 1 && diff <= 20)
-		{
-			// Continue walking the stream
-			return ReadStream(requested_frame);
-		}
-		else
-		{
-			// Greater than 30 frames away, or backwards, we need to seek to the nearest key frame
-			if (enable_seek)
-				// Only seek if enabled
-				Seek(requested_frame);
+    #pragma omp critical (ReadStream)
+	  {
+			// Check the cache a 2nd time (due to a potential previous lock)
+			if (has_missing_frames)
+			    CheckMissingFrame(requested_frame);
+			frame = final_cache.GetFrame(requested_frame);
+			if (frame) {
+				// Debug output
+				ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::GetFrame", "returned cached frame on 2nd look", requested_frame, "", -1, "", -1, "", -1, "", -1, "", -1);
 
-			else if (!enable_seek && diff < 0)
-			{
-				// Start over, since we can't seek, and the requested frame is smaller than our position
-				Close();
-				Open();
+				// Return the cached frame
 			}
+			else {
+				// Frame is not in cache
+				// Reset seek count
+				seek_count = 0;
+
+				// Check for first frame (always need to get frame 1 before other frames, to correctly calculate offsets)
+				if (last_frame == 0 && requested_frame != 1)
+					// Get first frame
+					ReadStream(1);
+
+				// Are we within X frames of the requested frame?
+				int64_t diff = requested_frame - last_frame;
+				if (diff >= 1 && diff <= 20)
+				{
+					// Continue walking the stream
+					frame = ReadStream(requested_frame);
+				}
+				else
+				{
+					// Greater than 30 frames away, or backwards, we need to seek to the nearest key frame
+					if (enable_seek)
+						// Only seek if enabled
+						Seek(requested_frame);
 
-			// Then continue walking the stream
-			return ReadStream(requested_frame);
-		}
+					else if (!enable_seek && diff < 0)
+					{
+						// Start over, since we can't seek, and the requested frame is smaller than our position
+						Close();
+						Open();
+					}
 
+					// Then continue walking the stream
+					frame = ReadStream(requested_frame);
+				}
+			}
+	  } //omp critical
+    return frame;
 	}
 }
 

src/Timeline.cpp

@@ -808,7 +808,7 @@ std::shared_ptr<Frame> Timeline::GetFrame(int64_t requested_frame)
 				ZmqLogger::Instance()->AppendDebugMethod("Timeline::GetFrame (Add frame to cache)", "frame_number", frame_number, "info.width", info.width, "info.height", info.height, "", -1, "", -1, "", -1);
 
 				// Set frame # on mapped frame
-				#pragma omp critical (T_GetFrame)
+				#pragma omp ordered
 				{
 					new_frame->SetFrameNumber(frame_number);
 

src/bindings/python/CMakeLists.txt

@@ -55,8 +55,7 @@ IF (PYTHONLIBS_FOUND)
 		GET_FILENAME_COMPONENT(_ABS_PYTHON_MODULE_PATH "${_ABS_PYTHON_MODULE_PATH}" ABSOLUTE)
 		FILE(RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
 		SET(PYTHON_MODULE_PATH ${_REL_PYTHON_MODULE_PATH})
-		
-		
+
 		############### INSTALL HEADERS & LIBRARY ################
 		### Install Python bindings
 		INSTALL(TARGETS _openshot DESTINATION ${PYTHON_MODULE_PATH} )