2.0. ffmpeg_producer: Fixed integer overflow when looping.

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

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 11512c524f465b13f50f84b2c2b3a1304f6e4094..13827e734b4c1982c5bd1a99c378b348a55c2ed2 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -19,21 +19,38 @@
 */\r
 #pragma once\r
 \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 core {\r
        \r
 class device_buffer;\r
+class ogl_device;\r
+\r
+struct draw_params\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
+       std::shared_ptr<device_buffer>                  background;\r
+       std::shared_ptr<device_buffer>                  local_key;\r
+       std::shared_ptr<device_buffer>                  layer_key;\r
+\r
+       draw_params() : blend_mode(blend_mode::normal){}\r
+};\r
 \r
-class image_kernel\r
+class image_kernel : boost::noncopyable\r
 {\r
 public:\r
        image_kernel();\r
-       void draw(size_t width,  size_t height, const core::pixel_format_desc& pix_desc,  const core::image_transform& transform, const std::vector<safe_ptr<device_buffer>>& planes, \r
-                         const safe_ptr<device_buffer>& background, const std::shared_ptr<device_buffer>& local_key = nullptr, const std::shared_ptr<device_buffer>& layer_key = nullptr);\r
+       void draw(ogl_device& ogl, draw_params&& params);\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r