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 377dd6d10cece94efeb4823cb313116b7ee52d41..13827e734b4c1982c5bd1a99c378b348a55c2ed2 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -19,33 +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 render_item\r
+struct draw_params\r
 {\r
        pixel_format_desc                                               pix_desc;\r
        std::vector<safe_ptr<device_buffer>>    textures;\r
-       image_transform                                                 transform;\r
-       video_mode::type                                                mode;\r
-       const void*                                                             tag;\r
-};\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
-bool operator==(const render_item& lhs, const render_item& rhs);\r
+       draw_params() : blend_mode(blend_mode::normal){}\r
+};\r
 \r
 class image_kernel : boost::noncopyable\r
 {\r
 public:\r
        image_kernel();\r
-       void draw(const render_item& item, 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