From c5197d4594c260da9bc9861e0fac4b9b3ff16ecd Mon Sep 17 00:00:00 2001
From: Helge Norberg <helge.norberg@svt.se>
Date: Mon, 30 Nov 2015 21:59:29 +0100
Subject: [PATCH] Use fast_memcpy in more places

---
 modules/html/producer/html_producer.cpp       | 4 +++-
 modules/reroute/producer/channel_producer.cpp | 3 ++-
 modules/screen/consumer/screen_consumer.cpp   | 9 +++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/html/producer/html_producer.cpp b/modules/html/producer/html_producer.cpp
index 30d8ed06f..551b5a83b 100644
--- a/modules/html/producer/html_producer.cpp
+++ b/modules/html/producer/html_producer.cpp
@@ -44,6 +44,7 @@
 #include <common/prec_timer.h>
 #include <common/linq.h>
 #include <common/os/filesystem.h>
+#include <common/memcpy.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
@@ -211,7 +212,7 @@ private:
 			pixel_desc.planes.push_back(
 				core::pixel_format_desc::plane(width, height, 4));
 		auto frame = frame_factory_->create_frame(this, pixel_desc, core::audio_channel_layout::invalid());
-		A_memcpy(frame.image_data().begin(), buffer, width * height * 4);
+		fast_memcpy(frame.image_data().begin(), buffer, width * height * 4);
 
 		lock(frames_mutex_, [&]
 		{
@@ -310,6 +311,7 @@ private:
 			browser_->SendProcessMessage(
 					CefProcessId::PID_RENDERER,
 					CefProcessMessage::Create(TICK_MESSAGE_NAME));
+
 		graph_->set_value("tick-time", tick_timer_.elapsed()
 				* format_desc_.fps
 				* format_desc_.field_count
diff --git a/modules/reroute/producer/channel_producer.cpp b/modules/reroute/producer/channel_producer.cpp
index 7720cd084..335211307 100644
--- a/modules/reroute/producer/channel_producer.cpp
+++ b/modules/reroute/producer/channel_producer.cpp
@@ -44,6 +44,7 @@
 #include <common/except.h>
 #include <common/memory.h>
 #include <common/future.h>
+#include <common/memcpy.h>
 
 #include <tbb/concurrent_queue.h>
 
@@ -270,7 +271,7 @@ public:
 			boost::copy(read_frame.audio_data(), std::back_inserter(frame.audio_data()));
 		}
 
-		A_memcpy(frame.image_data().begin(), read_frame.image_data().begin(), read_frame.image_data().size());
+		fast_memcpy(frame.image_data().begin(), read_frame.image_data().begin(), read_frame.image_data().size());
 
 		frame_buffer_.push(core::draw_frame(std::move(frame)));
 		
diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index 09434790c..ae8960b4c 100644
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -30,6 +30,7 @@
 #include <common/memory.h>
 #include <common/array.h>
 #include <common/memshfl.h>
+#include <common/memcpy.h>
 #include <common/utf.h>
 #include <common/prec_timer.h>
 #include <common/future.h>
@@ -503,12 +504,8 @@ public:
 				});
 			}
 			else
-			{	
-				tbb::parallel_for(tbb::blocked_range<int>(0, format_desc_.height), [&](const tbb::blocked_range<int>& r)
-				{
-					for(int n = r.begin(); n != r.end(); ++n)
-						A_memcpy(ptr+n*format_desc_.width*4, av_frame->data[0]+n*av_frame->linesize[0], format_desc_.width*4);
-				});
+			{
+				fast_memcpy(ptr, av_frame->data[0], format_desc_.size);
 			}
 			
 			GL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); // release the mapped buffer
-- 
2.39.2