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 2af0d5bcf60bb4326bf2f18809bc0e3b5484acf6..13827e734b4c1982c5bd1a99c378b348a55c2ed2 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -33,27 +33,24 @@ namespace caspar { namespace core {
 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
        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
-       render_item() : blend_mode(blend_mode::normal){}\r
+       draw_params() : 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 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
+       void draw(ogl_device& ogl, draw_params&& params);\r
 private:\r
        struct implementation;\r
        safe_ptr<implementation> impl_;\r