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 9debd7fd36551ca304b718d44c99018ee009caf4..13827e734b4c1982c5bd1a99c378b348a55c2ed2 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -24,7 +24,7 @@
 #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
@@ -33,42 +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
-       image_transform                                                 transform;\r
-       video_mode::type                                                mode;\r
-       const void*                                                             tag;\r
+       frame_transform                                                 transform;\r
        blend_mode::type                                                blend_mode;\r
-       \r
-       render_item(const pixel_format_desc& pix_desc, const std::vector<safe_ptr<device_buffer>>& textures, const image_transform& transform, video_mode::type mode, const void* tag, blend_mode::type blend_mode)\r
-               : pix_desc(pix_desc)\r
-               , textures(textures)\r
-               , transform(transform)\r
-               , mode(mode)\r
-               , tag(tag)\r
-               , blend_mode(blend_mode){}\r
-       render_item(render_item&& other)\r
-               : pix_desc(other.pix_desc)\r
-               , textures(std::move(other.textures))\r
-               , transform(other.transform)\r
-               , mode(other.mode)\r
-               , tag(other.tag)\r
-               , blend_mode(blend_mode){}\r
-};\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(ogl_device& ogl, \r
-                         render_item&& item, \r
-                         const safe_ptr<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