2.0. ffmpeg_producer: Fixed integer overflow when looping.

[casparcg] / core / mixer / image / image_mixer.cpp

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index ec167ce39cbc1bf4b68666df026eb9e25496b090..302d7af5e681f458c788391871cb0cf41abf5356 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -48,10 +48,17 @@ using namespace boost::assign;
 \r
 namespace caspar { namespace core {\r
        \r
+struct item\r
+{\r
+       pixel_format_desc                                               pix_desc;\r
+       std::vector<safe_ptr<device_buffer>>    textures;\r
+       frame_transform                                                 transform;\r
+};\r
+\r
 struct layer\r
 {\r
-       std::vector<render_item> items;\r
-       blend_mode::type                 blend_mode;\r
+       std::vector<item>                                               items;\r
+       blend_mode::type                                                blend_mode;\r
 \r
        layer(blend_mode::type blend_mode) : blend_mode(blend_mode)\r
        {\r
@@ -90,24 +97,24 @@ private:
 \r
                        BOOST_FOREACH(auto& layer, upper)\r
                        {\r
-                               boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::upper);});\r
+                               boost::remove_erase_if(layer.items, [](const item& item){return !(item.transform.field_mode & field_mode::upper);});\r
                                BOOST_FOREACH(auto& item, layer.items)\r
                                        item.transform.field_mode = field_mode::upper;\r
                        }\r
 \r
                        BOOST_FOREACH(auto& layer, lower)\r
                        {\r
-                               boost::remove_erase_if(layer.items, [](const render_item& item){return !(item.transform.field_mode & field_mode::lower);});\r
+                               boost::remove_erase_if(layer.items, [](const item& item){return !(item.transform.field_mode & field_mode::lower);});\r
                                BOOST_FOREACH(auto& item, layer.items)\r
                                        item.transform.field_mode = field_mode::lower;\r
                        }\r
 \r
-                       draw(std::move(upper), *draw_buffer);\r
-                       draw(std::move(lower), *draw_buffer);\r
+                       draw(std::move(upper), draw_buffer);\r
+                       draw(std::move(lower), draw_buffer);\r
                }\r
                else\r
                {\r
-                       draw(std::move(layers), *draw_buffer);\r
+                       draw(std::move(layers), draw_buffer);\r
                }\r
 \r
                auto host_buffer = channel_.ogl().create_host_buffer(channel_.get_format_desc().size, host_buffer::read_only);\r
@@ -121,8 +128,8 @@ private:
                return host_buffer;\r
        }\r
 \r
-       void draw(std::vector<layer>&&  layers, \r
-                         device_buffer&                draw_buffer)\r
+       void draw(std::vector<layer>&&          layers, \r
+                         safe_ptr<device_buffer>&      draw_buffer)\r
        {\r
                std::shared_ptr<device_buffer> layer_key_buffer;\r
 \r
@@ -131,7 +138,7 @@ private:
        }\r
 \r
        void draw_layer(layer&&                                                 layer, \r
-                                       device_buffer&                                  draw_buffer,\r
+                                       safe_ptr<device_buffer>&                draw_buffer,\r
                                        std::shared_ptr<device_buffer>& layer_key_buffer)\r
        {                               \r
                if(layer.items.empty())\r
@@ -144,16 +151,17 @@ private:
                        auto layer_draw_buffer = create_device_buffer(4);\r
 \r
                        BOOST_FOREACH(auto& item, layer.items)\r
-                               draw_item(std::move(item), *layer_draw_buffer, local_key_buffer, layer_key_buffer);             \r
+                               draw_item(std::move(item), layer_draw_buffer, local_key_buffer, layer_key_buffer);              \r
                                                \r
-                       render_item item;\r
-                       item.pix_desc.pix_fmt   = pixel_format::bgra;\r
-                       item.pix_desc.planes    = list_of(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
-                       item.textures                   = list_of(layer_draw_buffer);\r
-                       item.transform                  = frame_transform();\r
-                       item.blend_mode                 = layer.blend_mode;\r
-\r
-                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, nullptr, nullptr);\r
+                       draw_params draw_params;\r
+                       draw_params.pix_desc.pix_fmt    = pixel_format::bgra;\r
+                       draw_params.pix_desc.planes             = list_of(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
+                       draw_params.textures                    = list_of(layer_draw_buffer);\r
+                       draw_params.transform                   = frame_transform();\r
+                       draw_params.blend_mode                  = layer.blend_mode;\r
+                       draw_params.background                  = draw_buffer;\r
+\r
+                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }\r
                else // fast path\r
                {\r
@@ -164,20 +172,34 @@ private:
                std::swap(local_key_buffer, layer_key_buffer);\r
        }\r
 \r
-       void draw_item(render_item&&                                    item, \r
-                                  device_buffer&                                       draw_buffer, \r
+       void draw_item(item&&                                                   item, \r
+                                  safe_ptr<device_buffer>&                     draw_buffer, \r
                                   std::shared_ptr<device_buffer>&      local_key_buffer, \r
                                   std::shared_ptr<device_buffer>&      layer_key_buffer)\r
-       {                                       \r
+       {                       \r
+               draw_params draw_params;\r
+               draw_params.pix_desc                            = std::move(item.pix_desc);\r
+               draw_params.textures                            = std::move(item.textures);\r
+               draw_params.transform                           = std::move(item.transform);\r
+               draw_params.blend_mode                          = blend_mode::normal;\r
+\r
                if(item.transform.is_key)\r
                {\r
                        local_key_buffer = local_key_buffer ? local_key_buffer : create_device_buffer(1);\r
-                       kernel_.draw(channel_.ogl(), std::move(item), *local_key_buffer, nullptr, nullptr);\r
+\r
+                       draw_params.background                  = local_key_buffer;\r
+                       draw_params.local_key                   = nullptr;\r
+                       draw_params.layer_key                   = nullptr;\r
+\r
+                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }\r
                else\r
                {\r
-                       kernel_.draw(channel_.ogl(), std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);\r
-                       local_key_buffer = nullptr;\r
+                       draw_params.background                  = draw_buffer;\r
+                       draw_params.local_key                   = std::move(local_key_buffer);\r
+                       draw_params.layer_key                   = layer_key_buffer;\r
+\r
+                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }       \r
        }\r
                        \r
@@ -218,7 +240,7 @@ public:
                if(frame.get_frame_transform().field_mode == field_mode::empty)\r
                        return;\r
 \r
-               core::render_item item;\r
+               item item;\r
                item.pix_desc   = frame.get_pixel_format_desc();\r
                item.textures   = frame.get_textures();\r
                item.transform  = transform_stack_.back();\r