From 0bcf1e49247977e2821e093573d9d64cf7585caf Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sun, 13 Sep 2020 19:56:40 -0400
Subject: [PATCH] Frame: Reduce code duplication

---
 src/Frame.cpp | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/Frame.cpp b/src/Frame.cpp
index 67371655e..c3c50bcd5 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -762,31 +762,31 @@ void Frame::AddColor(int new_width, int new_height, std::string new_color)
 }
 
 // Add (or replace) pixel data to the frame
-void Frame::AddImage(int new_width, int new_height, int bytes_per_pixel, QImage::Format type, const unsigned char *pixels_)
+void Frame::AddImage(
+	int new_width, int new_height, int bytes_per_pixel,
+	QImage::Format type, const unsigned char *pixels_)
 {
 	// Create new buffer
-	const GenericScopedLock<juce::CriticalSection> lock(addingImageSection);
-	int buffer_size = new_width * new_height * bytes_per_pixel;
-	qbuffer = new unsigned char[buffer_size]();
-
-	// Copy buffer data
-	memcpy((unsigned char*)qbuffer, pixels_, buffer_size);
-
-	// Create new image object, and fill with pixel data
-	#pragma omp critical (AddImage)
 	{
-		image = std::make_shared<QImage>(
-			qbuffer, new_width, new_height, new_width * bytes_per_pixel, type, (QImageCleanupFunction) &openshot::Frame::cleanUpBuffer, (void*) qbuffer);
-
-		// Always convert to RGBA8888 (if different)
-		if (image->format() != QImage::Format_RGBA8888)
-			*image = image->convertToFormat(QImage::Format_RGBA8888);
-
-			// Update height and width
-		width = image->width();
-		height = image->height();
-		has_image_data = true;
-	}
+		const GenericScopedLock<juce::CriticalSection> lock(addingImageSection);
+		int buffer_size = new_width * new_height * bytes_per_pixel;
+		qbuffer = new unsigned char[buffer_size]();
+
+		// Copy buffer data
+		memcpy((unsigned char*)qbuffer, pixels_, buffer_size);
+
+	}  // Release addingImageSection lock
+
+	// Create new image object from pixel data
+	auto new_image = std::make_shared<QImage>(
+		qbuffer,
+		new_width, new_height,
+		new_width * bytes_per_pixel,
+		type,
+		(QImageCleanupFunction) &openshot::Frame::cleanUpBuffer,
+		(void*) qbuffer
+	);
+	AddImage(new_image);
 }
 
 // Add (or replace) pixel data to the frame
@@ -826,7 +826,6 @@ void Frame::AddImage(std::shared_ptr<QImage> new_image, bool only_odd_lines)
 		AddImage(new_image);
 
 	} else {
-
 		// Ignore image of different sizes or formats
 		bool ret=false;
 		#pragma omp critical (AddImage)