2.0 image_mixer: Refactored, core: Fixed destruction proxy usage.

[casparcg] / core / mixer / image / image_kernel.h

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 107da5f01ae02f277ec08b5881391b19f0db37a0..2af0d5bcf60bb4326bf2f18809bc0e3b5484acf6 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -19,22 +19,44 @@
 */\r
 #pragma once\r
 \r
-#include <memory>\r
+#include "blend_modes.h"\r
+\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <core/producer/frame/pixel_format.h>\r
-#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
+\r
+#include <boost/noncopyable.hpp>\r
 \r
-namespace caspar { namespace mixer {\r
+namespace caspar { namespace core {\r
        \r
-class image_kernel\r
+class device_buffer;\r
+class ogl_device;\r
+\r
+struct render_item\r
+{\r
+       pixel_format_desc                                               pix_desc;\r
+       std::vector<safe_ptr<device_buffer>>    textures;\r
+       frame_transform                                                 transform;\r
+       blend_mode::type                                                blend_mode;\r
+\r
+       render_item() : blend_mode(blend_mode::normal){}\r
+};\r
+\r
+bool operator==(const render_item& lhs, const render_item& rhs);\r
+\r
+class image_kernel : boost::noncopyable\r
 {\r
 public:\r
        image_kernel();\r
-       void apply(const core::pixel_format_desc& pix_desc, const core::image_transform& mode, bool has_seperate_key);\r
-\r
+       void draw(ogl_device& ogl, \r
+                         render_item&& item, \r
+                         device_buffer& background, \r
+                         const std::shared_ptr<device_buffer>& local_key = nullptr, \r
+                         const std::shared_ptr<device_buffer>& layer_key = nullptr);\r
 private:\r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file