2.0. ffmpeg_producer: Fixed integer overflow when looping.

     image_mixer: Refactored draw call parameters.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1282 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 3209bd4e9a0ff83cbd9f41d3b23a7ab4af02bf1d..e659c618b1678a5888aac89054ac98cdc81e35db 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -61,23 +61,19 @@ struct image_kernel::implementation : boost::noncopyable
        std::shared_ptr<shader> shader_;\r
        bool                                    blend_modes_;\r
                                                        \r
-       void draw(ogl_device&                                                                   ogl,\r
-                         render_item&&                                                                 item,\r
-                         device_buffer&                                                                background,\r
-                         const std::shared_ptr<device_buffer>&                 local_key,                        \r
-                         const std::shared_ptr<device_buffer>&                 layer_key)\r
+       void draw(ogl_device& ogl, draw_params&& params)\r
        {\r
                static const double epsilon = 0.001;\r
 \r
-               CASPAR_ASSERT(item.pix_desc.planes.size() == item.textures.size());\r
+               CASPAR_ASSERT(params.pix_desc.planes.size() == params.textures.size());\r
 \r
-               if(item.textures.empty())\r
+               if(params.textures.empty() || !params.background)\r
                        return;\r
 \r
-               if(item.transform.opacity < epsilon)\r
+               if(params.transform.opacity < epsilon)\r
                        return;\r
                \r
-               if(!std::all_of(item.textures.begin(), item.textures.end(), std::mem_fn(&device_buffer::ready)))\r
+               if(!std::all_of(params.textures.begin(), params.textures.end(), std::mem_fn(&device_buffer::ready)))\r
                {\r
                        CASPAR_LOG(warning) << L"[image_mixer] Performance warning. Host to device transfer not complete, GPU will be stalled";\r
                        ogl.yield(); // Try to give it some more time.\r
@@ -85,14 +81,14 @@ struct image_kernel::implementation : boost::noncopyable
                \r
                // Bind textures\r
 \r
-               for(size_t n = 0; n < item.textures.size(); ++n)\r
-                       item.textures[n]->bind(n);\r
+               for(size_t n = 0; n < params.textures.size(); ++n)\r
+                       params.textures[n]->bind(n);\r
 \r
-               if(local_key)\r
-                       local_key->bind(texture_id::local_key);\r
+               if(params.local_key)\r
+                       params.local_key->bind(texture_id::local_key);\r
                \r
-               if(layer_key)\r
-                       layer_key->bind(texture_id::layer_key);\r
+               if(params.layer_key)\r
+                       params.layer_key->bind(texture_id::layer_key);\r
                        \r
                // Setup shader\r
 \r
@@ -107,23 +103,23 @@ struct image_kernel::implementation : boost::noncopyable
                shader_->set("plane[3]",                texture_id::plane3);\r
                shader_->set("local_key",               texture_id::local_key);\r
                shader_->set("layer_key",               texture_id::layer_key);\r
-               shader_->set("is_hd",                   item.pix_desc.planes.at(0).height > 700 ? 1 : 0);\r
-               shader_->set("has_local_key",   local_key);\r
-               shader_->set("has_layer_key",   layer_key);\r
-               shader_->set("pixel_format",    item.pix_desc.pix_fmt); \r
-               shader_->set("opacity",                 item.transform.is_key ? 1.0 : item.transform.opacity);  \r
+               shader_->set("is_hd",                   params.pix_desc.planes.at(0).height > 700 ? 1 : 0);\r
+               shader_->set("has_local_key",   params.local_key);\r
+               shader_->set("has_layer_key",   params.layer_key);\r
+               shader_->set("pixel_format",    params.pix_desc.pix_fmt);       \r
+               shader_->set("opacity",                 params.transform.is_key ? 1.0 : params.transform.opacity);      \r
                \r
                // Setup blend_func\r
                \r
-               if(item.transform.is_key)\r
-                       item.blend_mode = blend_mode::normal;\r
+               if(params.transform.is_key)\r
+                       params.blend_mode = blend_mode::normal;\r
 \r
                if(blend_modes_)\r
                {\r
-                       background.bind(6);\r
+                       params.background->bind(6);\r
 \r
                        shader_->set("background",      texture_id::background);\r
-                       shader_->set("blend_mode",      item.blend_mode);\r
+                       shader_->set("blend_mode",      params.blend_mode);\r
                }\r
                else\r
                {\r
@@ -132,74 +128,74 @@ struct image_kernel::implementation : boost::noncopyable
 \r
                // Setup image-adjustements\r
                \r
-               if(item.transform.levels.min_input  > epsilon           ||\r
-                  item.transform.levels.max_input  < 1.0-epsilon       ||\r
-                  item.transform.levels.min_output > epsilon           ||\r
-                  item.transform.levels.max_output < 1.0-epsilon       ||\r
-                  std::abs(item.transform.levels.gamma - 1.0) > epsilon)\r
+               if(params.transform.levels.min_input  > epsilon         ||\r
+                  params.transform.levels.max_input  < 1.0-epsilon     ||\r
+                  params.transform.levels.min_output > epsilon         ||\r
+                  params.transform.levels.max_output < 1.0-epsilon     ||\r
+                  std::abs(params.transform.levels.gamma - 1.0) > epsilon)\r
                {\r
                        shader_->set("levels", true);   \r
-                       shader_->set("min_input",       item.transform.levels.min_input);       \r
-                       shader_->set("max_input",       item.transform.levels.max_input);\r
-                       shader_->set("min_output",      item.transform.levels.min_output);\r
-                       shader_->set("max_output",      item.transform.levels.max_output);\r
-                       shader_->set("gamma",           item.transform.levels.gamma);\r
+                       shader_->set("min_input",       params.transform.levels.min_input);     \r
+                       shader_->set("max_input",       params.transform.levels.max_input);\r
+                       shader_->set("min_output",      params.transform.levels.min_output);\r
+                       shader_->set("max_output",      params.transform.levels.max_output);\r
+                       shader_->set("gamma",           params.transform.levels.gamma);\r
                }\r
                else\r
                        shader_->set("levels", false);  \r
 \r
-               if(std::abs(item.transform.brightness - 1.0) > epsilon ||\r
-                  std::abs(item.transform.saturation - 1.0) > epsilon ||\r
-                  std::abs(item.transform.contrast - 1.0)   > epsilon)\r
+               if(std::abs(params.transform.brightness - 1.0) > epsilon ||\r
+                  std::abs(params.transform.saturation - 1.0) > epsilon ||\r
+                  std::abs(params.transform.contrast - 1.0)   > epsilon)\r
                {\r
                        shader_->set("csb",     true);  \r
                        \r
-                       shader_->set("brt", item.transform.brightness); \r
-                       shader_->set("sat", item.transform.saturation);\r
-                       shader_->set("con", item.transform.contrast);\r
+                       shader_->set("brt", params.transform.brightness);       \r
+                       shader_->set("sat", params.transform.saturation);\r
+                       shader_->set("con", params.transform.contrast);\r
                }\r
                else\r
                        shader_->set("csb",     false); \r
                \r
                // Setup interlacing\r
 \r
-               if(item.transform.field_mode == core::field_mode::progressive)                  \r
+               if(params.transform.field_mode == core::field_mode::progressive)                        \r
                        ogl.disable(GL_POLYGON_STIPPLE);                        \r
                else                    \r
                {\r
                        ogl.enable(GL_POLYGON_STIPPLE);\r
 \r
-                       if(item.transform.field_mode == core::field_mode::upper)\r
+                       if(params.transform.field_mode == core::field_mode::upper)\r
                                ogl.stipple_pattern(upper_pattern);\r
-                       else if(item.transform.field_mode == core::field_mode::lower)\r
+                       else if(params.transform.field_mode == core::field_mode::lower)\r
                                ogl.stipple_pattern(lower_pattern);\r
                }\r
 \r
                // Setup drawing area\r
                \r
-               ogl.viewport(0, 0, background.width(), background.height());\r
+               ogl.viewport(0, 0, params.background->width(), params.background->height());\r
                                                                \r
-               auto m_p = item.transform.clip_translation;\r
-               auto m_s = item.transform.clip_scale;\r
+               auto m_p = params.transform.clip_translation;\r
+               auto m_s = params.transform.clip_scale;\r
 \r
                bool scissor = m_p[0] > std::numeric_limits<double>::epsilon()                  || m_p[1] > std::numeric_limits<double>::epsilon() ||\r
                                           m_s[0] < (1.0 - std::numeric_limits<double>::epsilon())      || m_s[1] < (1.0 - std::numeric_limits<double>::epsilon());\r
 \r
                if(scissor)\r
                {\r
-                       double w = static_cast<double>(background.width());\r
-                       double h = static_cast<double>(background.height());\r
+                       double w = static_cast<double>(params.background->width());\r
+                       double h = static_cast<double>(params.background->height());\r
                \r
                        ogl.enable(GL_SCISSOR_TEST);\r
                        ogl.scissor(static_cast<size_t>(m_p[0]*w), static_cast<size_t>(m_p[1]*h), static_cast<size_t>(m_s[0]*w), static_cast<size_t>(m_s[1]*h));\r
                }\r
 \r
-               auto f_p = item.transform.fill_translation;\r
-               auto f_s = item.transform.fill_scale;\r
+               auto f_p = params.transform.fill_translation;\r
+               auto f_s = params.transform.fill_scale;\r
                \r
                // Set render target\r
                \r
-               ogl.attach(background);\r
+               ogl.attach(*params.background);\r
                \r
                // Draw\r
 \r
@@ -214,7 +210,7 @@ struct image_kernel::implementation : boost::noncopyable
 \r
                ogl.disable(GL_SCISSOR_TEST);   \r
                                \r
-               item.textures.clear();\r
+               params.textures.clear();\r
                ogl.yield(); // Return resources to pool as early as possible.\r
 \r
                if(blend_modes_)\r
@@ -227,18 +223,9 @@ struct image_kernel::implementation : boost::noncopyable
 };\r
 \r
 image_kernel::image_kernel() : impl_(new implementation()){}\r
-void image_kernel::draw(ogl_device& ogl, \r
-                                               render_item&& item, \r
-                                               device_buffer& background,\r
-                                               const std::shared_ptr<device_buffer>& local_key, \r
-                                               const std::shared_ptr<device_buffer>& layer_key)\r
+void image_kernel::draw(ogl_device& ogl, draw_params&& params)\r
 {\r
-       impl_->draw(ogl, std::move(item), background, local_key, layer_key);\r
-}\r
-\r
-bool operator==(const render_item& lhs, const render_item& rhs)\r
-{\r
-       return lhs.textures == rhs.textures && lhs.transform == rhs.transform;\r
+       impl_->draw(ogl, std::move(params));\r
 }\r
 \r
 }}
\ No newline at end of file

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

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

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 3db902f5fe64b8e93776972bebce1a95e3de7e65..839e35a1d02611da708a264500fb65994da7515c 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -172,7 +172,7 @@ public:
        virtual int64_t nb_frames() const \r
        {\r
                if(loop_)\r
-                       return std::numeric_limits<int64_t>::max();\r
+                       return std::numeric_limits<int>::max();\r
 \r
                // This function estimates nb_frames until input has read all packets for one loop, at which point the count should be accurate.\r
 \r