2.1.0: Moved gpu stuff into gpu folder.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2180 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 69dcbccf0b9625a4d3c2e11d6184c30ae3ae2538..cea2e14eeedcaaaa16ac9c86759d7bd79fc766a7 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -30,8 +30,7 @@
 #include "frame_consumer.h"\r
 \r
 #include "../video_format.h"\r
-#include "../mixer/gpu/accelerator.h"\r
-#include "../mixer/read_frame.h"\r
+#include "../frame/data_frame.h"\r
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/diagnostics/graph.h>\r
@@ -50,18 +49,13 @@ namespace caspar { namespace core {
        \r
 struct output::impl\r
 {              \r
-       const int                                                                               channel_index_;\r
-\r
-       video_format_desc                                                               format_desc_;\r
-\r
-       std::map<int, safe_ptr<frame_consumer>>                 consumers_;\r
-       \r
-       prec_timer                                                                              sync_timer_;\r
-\r
+       const int                                                                                       channel_index_;\r
+       video_format_desc                                                                       format_desc_;\r
+       std::map<int, safe_ptr<frame_consumer>>                         consumers_;     \r
+       prec_timer                                                                                      sync_timer_;\r
        boost::circular_buffer<safe_ptr<const data_frame>>      frames_;\r
 \r
-       executor                                                                                executor_;\r
-               \r
+       executor                                                                                        executor_;              \r
 public:\r
        impl(const video_format_desc& format_desc, int channel_index) \r
                : channel_index_(channel_index)\r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index d6f2f2a1bc09e7d5070b523bb03d3b8d6d368499..be615ac6bc1136508c91a8776ca7c248835d1c82 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -131,7 +131,9 @@
     <ClInclude Include="mixer\gpu\image\image_mixer.h" />\r
     <ClInclude Include="mixer\gpu\image\image_shader.h" />\r
     <ClInclude Include="mixer\gpu\accelerator.h" />\r
+    <ClInclude Include="mixer\gpu\read_frame.h" />\r
     <ClInclude Include="mixer\gpu\shader.h" />\r
+    <ClInclude Include="mixer\gpu\write_frame.h" />\r
     <ClInclude Include="mixer\image\blend_modes.h" />\r
     <ClInclude Include="video_channel.h" />\r
     <ClInclude Include="consumer\output.h" />\r
@@ -139,8 +141,6 @@
     <ClInclude Include="mixer\audio\audio_mixer.h" />\r
     <ClInclude Include="mixer\mixer.h" />\r
     <ClInclude Include="mixer\image\image_mixer.h" />\r
-    <ClInclude Include="mixer\read_frame.h" />\r
-    <ClInclude Include="mixer\write_frame.h" />\r
     <ClInclude Include="producer\color\color_producer.h" />\r
     <ClInclude Include="producer\frame_producer.h" />\r
     <ClInclude Include="producer\stage.h" />\r
@@ -192,10 +192,18 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
+    <ClCompile Include="mixer\gpu\read_frame.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
     <ClCompile Include="mixer\gpu\shader.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
+    <ClCompile Include="mixer\gpu\write_frame.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
     <ClCompile Include="mixer\image\blend_modes.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
@@ -217,14 +225,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
-    <ClCompile Include="mixer\read_frame.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
-    <ClCompile Include="mixer\write_frame.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
     <ClCompile Include="producer\color\color_producer.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../StdAfx.h</PrecompiledHeaderFile>\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index e7db5e71e3028c726c4b29eb313c2d1a998ed4e1..d880d0e2a1a7dc0ba5899d71ad49a6dfc6abdae4 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -60,12 +60,6 @@
     <ClInclude Include="mixer\audio\audio_mixer.h">\r
       <Filter>source\mixer\audio</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="mixer\read_frame.h">\r
-      <Filter>source\mixer</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="mixer\write_frame.h">\r
-      <Filter>source\mixer</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="mixer\mixer.h">\r
       <Filter>source\mixer</Filter>\r
@@ -133,6 +127,12 @@
     <ClInclude Include="frame\draw_frame.h">\r
       <Filter>source\frame</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="mixer\gpu\read_frame.h">\r
+      <Filter>source\mixer\gpu</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="mixer\gpu\write_frame.h">\r
+      <Filter>source\mixer\gpu</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r
@@ -153,12 +153,6 @@
     <ClCompile Include="producer\separated\separated_producer.cpp">\r
       <Filter>source\producer\separated</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="mixer\read_frame.cpp">\r
-      <Filter>source\mixer</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="mixer\write_frame.cpp">\r
-      <Filter>source\mixer</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="StdAfx.cpp" />\r
     <ClCompile Include="mixer\mixer.cpp">\r
       <Filter>source\mixer</Filter>\r
@@ -211,5 +205,11 @@
     <ClCompile Include="frame\data_frame.cpp">\r
       <Filter>source\frame</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="mixer\gpu\read_frame.cpp">\r
+      <Filter>source\mixer\gpu</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="mixer\gpu\write_frame.cpp">\r
+      <Filter>source\mixer\gpu</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 51378daaf683ffe0f04b4e1975d68389d79565f6..a660743e4ea0d171d9e905cce5adb2c9e8c2c1e0 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -23,7 +23,7 @@
 \r
 #include "audio_mixer.h"\r
 \r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 #include <core/frame/frame_transform.h>\r
 #include <common/diagnostics/graph.h>\r
 \r

diff --git a/core/mixer/gpu/image/image_mixer.cpp b/core/mixer/gpu/image/image_mixer.cpp
index 689c8af082b002324850656bba57a204e0490a7c..6d92505bd20b5296f053be914dd7109fef0e3335 100644 (file)
--- a/core/mixer/gpu/image/image_mixer.cpp
+++ b/core/mixer/gpu/image/image_mixer.cpp
@@ -24,10 +24,11 @@
 #include "image_mixer.h"\r
 \r
 #include "image_kernel.h"\r
+\r
+#include "../write_frame.h"\r
 #include "../accelerator.h"\r
 #include "../host_buffer.h"\r
 #include "../device_buffer.h"\r
-#include "../../write_frame.h"\r
 \r
 #include <common/gl/gl_check.h>\r
 \r

diff --git a/core/mixer/read_frame.cpp b/core/mixer/gpu/read_frame.cpp
similarity index 94%
rename from core/mixer/read_frame.cpp
rename to core/mixer/gpu/read_frame.cpp
index 5768bec776ef57d00f2c53a6efcf7fe11c087454..0672b2fcf606cecb5d27b589b982993d08c2b1f4 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/gpu/read_frame.cpp
@@ -19,16 +19,15 @@
 * Author: Robert Nagy, ronag89@gmail.com\r
 */\r
 \r
-#include "../stdafx.h"\r
+#include "../../stdafx.h"\r
 \r
 #include "read_frame.h"\r
-#include "../video_format.h"\r
-#include "../frame/pixel_format.h"\r
 \r
-#include "gpu/host_buffer.h"   \r
-\r
-#include <tbb/mutex.h>\r
+#include "host_buffer.h"\r
 \r
+#include "../../video_format.h"\r
+#include "../../frame/pixel_format.h"\r
+       \r
 namespace caspar { namespace core {\r
                                                                                                                                                                                                                                                                                                                        \r
 struct read_frame::impl : boost::noncopyable\r

diff --git a/core/mixer/read_frame.h b/core/mixer/gpu/read_frame.h
similarity index 95%
rename from core/mixer/read_frame.h
rename to core/mixer/gpu/read_frame.h
index 3451a40b188dfff6264f17c065579651f5e1784c..89f8dcf97fa6a69c57669748da65e3ee98ce3a18 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/gpu/read_frame.h
@@ -21,7 +21,7 @@
 \r
 #pragma once\r
 \r
-#include "../frame/data_frame.h"\r
+#include "../../frame/data_frame.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
 #include <common/forward.h>\r

diff --git a/core/mixer/write_frame.cpp b/core/mixer/gpu/write_frame.cpp
similarity index 94%
rename from core/mixer/write_frame.cpp
rename to core/mixer/gpu/write_frame.cpp
index 136028ab7f6506b538d41492028addceee759e81..a8db57c0d69d0b7810ffb7b0898cb288061d72bf 100644 (file)
--- a/core/mixer/write_frame.cpp
+++ b/core/mixer/gpu/write_frame.cpp
@@ -19,13 +19,13 @@
 * Author: Robert Nagy, ronag89@gmail.com\r
 */\r
 \r
-#include "../stdafx.h"\r
+#include "../../stdafx.h"\r
 \r
 #include "write_frame.h"\r
 \r
-#include "gpu/accelerator.h"\r
-#include "gpu/host_buffer.h"\r
-#include "gpu/device_buffer.h"\r
+#include "accelerator.h"\r
+#include "host_buffer.h"\r
+#include "device_buffer.h"\r
 \r
 #include <common/exception/exceptions.h>\r
 #include <core/frame/frame_visitor.h>\r

diff --git a/core/mixer/write_frame.h b/core/mixer/gpu/write_frame.h
similarity index 100%
rename from core/mixer/write_frame.h
rename to core/mixer/gpu/write_frame.h

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 826bf22a2aefad85afcc85aa6e1b60ab6d5a7b0c..fec01e6182da6efbc06f4fe7e2095952052aaad1 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -23,13 +23,15 @@
 \r
 #include "mixer.h"\r
 \r
-#include "read_frame.h"\r
-#include "write_frame.h"\r
+#include "../frame/data_frame.h"\r
 \r
 #include "audio/audio_mixer.h"\r
 #include "image/image_mixer.h"\r
+\r
 #include "gpu/image/image_mixer.h"\r
 #include "gpu/accelerator.h"\r
+#include "gpu/read_frame.h"\r
+#include "gpu/write_frame.h"\r
 \r
 #include <common/env.h>\r
 #include <common/concurrency/executor.h>\r

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index a1234e14194494234f8662478d439ae035a1f98c..06cc913132e3b929310cb4c0e98c63bd72a9e1fe 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -23,11 +23,11 @@
 \r
 #include "color_producer.h"\r
 \r
-#include "../frame_producer.h"\r
-#include "../../frame/draw_frame.h"\r
-#include "../../frame/frame_factory.h"\r
-#include "../../frame/pixel_format.h"\r
-#include "../../mixer/write_frame.h"\r
+#include <core/producer/frame_producer.h>\r
+#include <core/frame/draw_frame.h>\r
+#include <core/frame/frame_factory.h>\r
+#include <core/frame/pixel_format.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
 #include <common/exception/exceptions.h>\r
 \r

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index ad5eeeb6791823d6d634e1e1ee7faa38633912d1..d38a16c253653eac97c7320577844eba9f3167f0 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -27,7 +27,7 @@
 \r
 #include "consumer/output.h"\r
 #include "mixer/mixer.h"\r
-#include "mixer/write_frame.h"\r
+#include "mixer/gpu/write_frame.h"\r
 #include "mixer/gpu/accelerator.h"\r
 #include "frame/data_frame.h"\r
 #include "producer/stage.h"\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 93a6a4d87622a1ae8b6f8157513403d78c14adba..7b5cfb2dd1cdcd9f29c59207cecb0ea6793cb470 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -37,7 +37,7 @@
 #include <common/log.h>\r
 #include <common/utility/param.h>\r
 \r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 #include <core/frame/frame_transform.h>\r
 #include <core/frame/frame_factory.h>\r
 \r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 5af4c8952b64c5724f9b33d39f3a2e4b22ed2af0..17e0fbb34e1ddb8017b45e4bf009c00fec9c3b68 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -31,7 +31,7 @@
 #include <core/frame/frame_transform.h>\r
 #include <core/frame/pixel_format.h>\r
 #include <core/frame/frame_factory.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
 #include <common/env.h>\r
 #include <common/exception/exceptions.h>\r

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index aea493f43ee750576219bd486030c1bc5cae6393..ccd1b7d2ad7b6924183d0f6b4d684b6052f093b2 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -34,7 +34,7 @@
 #include <core/frame/frame_transform.h>\r
 #include <core/frame/frame_factory.h>\r
 #include <core/producer/frame_producer.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
 #include <common/exception/exceptions.h>\r
 \r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index f73659b967e9058a267284b364f81c287809b15b..052235921b0172e12b0254330422dc475ebf0fa2 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -34,7 +34,7 @@
 #include <core/frame/draw_frame.h>\r
 #include <core/frame/frame_factory.h>\r
 #include <core/frame/pixel_format.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
 #include <common/env.h>\r
 #include <common/concurrency/executor.h>\r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 9e0758ce76242e9388834b96fecf5088c2d45c98..4e8b7ace8dfa634e551cb309ab9193f4e0811c49 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -28,7 +28,7 @@
 #include <core/frame/draw_frame.h>\r
 #include <core/frame/frame_factory.h>\r
 #include <core/frame/pixel_format.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
 #include <common/env.h>\r
 #include <common/log.h>\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 3501661dce6dbcde5a11cbaa9785b523244735eb..e6b3a33270b453df3027266ed5be1c0bb4c0f949 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -29,7 +29,7 @@
 #include <core/frame/frame_factory.h>\r
 #include <core/frame/frame_transform.h>\r
 #include <core/frame/pixel_format.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 \r
 #include <common/env.h>\r
 #include <common/log.h>\r

diff --git a/modules/reroute/producer/reroute_producer.cpp b/modules/reroute/producer/reroute_producer.cpp
index f289897ed354d0280990d68662cdbb9d9d37f409..a2c029250ed9bc6e7b6b626ea129d40a88ad0eb6 100644 (file)
--- a/modules/reroute/producer/reroute_producer.cpp
+++ b/modules/reroute/producer/reroute_producer.cpp
@@ -27,7 +27,7 @@
 #include <core/frame/draw_frame.h>\r
 #include <core/frame/frame_factory.h>\r
 #include <core/frame/pixel_format.h>\r
-#include <core/mixer/write_frame.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
 #include <core/frame/data_frame.h>\r
 \r
 #include <common/exception/exceptions.h>\r