2.0. Fixed mix transition.

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

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index d74d5fd9649b77cd534b9164ad1edc9311d8f026..ba7db7ea09cddd89d066145584038999c299057e 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -336,16 +336,21 @@ void ogl_device::use(shader& shader)
        }\r
 }\r
 \r
-void ogl_device::blend_func_separate(int c1, int c2, int a1, int a2)\r
+void ogl_device::blend_func(int c1, int c2, int a1, int a2)\r
 {\r
        std::array<int, 4> func = {c1, c2, a1, a2};\r
 \r
        if(blend_func_ != func)\r
        {\r
                blend_func_ = func;\r
-               glBlendFuncSeparate(c1, c2, a1, a2);\r
+               GL(glBlendFuncSeparate(c1, c2, a1, a2));\r
        }\r
 }\r
 \r
+void ogl_device::blend_func(int c1, int c2)\r
+{\r
+       blend_func(c1, c2, c1, c2);\r
+}\r
+\r
 }}\r
 \r

diff --git a/core/mixer/gpu/ogl_device.h b/core/mixer/gpu/ogl_device.h
index ad5908c3b4dc201093216cb57ef770a8f6b22440..d1fb65b2dae6e442bd4220c2387b7a904e8d75c7 100644 (file)
--- a/core/mixer/gpu/ogl_device.h
+++ b/core/mixer/gpu/ogl_device.h
@@ -93,7 +93,8 @@ public:
        void begin_read(host_buffer& dest, device_buffer& source);\r
        void begin_read(device_buffer& dest, host_buffer& source);\r
 \r
-       void blend_func_separate(int c1, int c2, int a1, int a2);\r
+       void blend_func(int c1, int c2, int a1, int a2);\r
+       void blend_func(int c1, int c2);\r
        \r
        void use(shader& shader);\r
 \r

diff --git a/core/mixer/image/blend_modes.h b/core/mixer/image/blend_modes.h
index b008a998309fc2bb919647c505e5b02248b4d411..cd6500e1fcc84e5d3aa55174eb9ce81e5bff4415 100644 (file)
--- a/core/mixer/image/blend_modes.h
+++ b/core/mixer/image/blend_modes.h
@@ -35,6 +35,7 @@ struct blend_mode
                saturation,\r
                color,\r
                luminosity,\r
+               mix,\r
                blend_mode_count \r
        };\r
 };\r

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index e659c618b1678a5888aac89054ac98cdc81e35db..1fd83d91d5d8b0b0efd6a32cd21f8c4adaa70c80 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -123,7 +123,14 @@ struct image_kernel::implementation : boost::noncopyable
                }\r
                else\r
                {\r
-                       ogl.blend_func_separate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);                        \r
+                       switch(params.blend_mode)\r
+                       {\r
+                       case blend_mode::mix:\r
+                               ogl.blend_func(GL_ONE, GL_ONE); \r
+                               break;\r
+                       default:                                \r
+                               ogl.blend_func(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); \r
+                       }               \r
                }\r
 \r
                // Setup image-adjustements\r

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 13827e734b4c1982c5bd1a99c378b348a55c2ed2..31e9098e404dae16b6cb71bf6cbe0e667b261c5b 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -43,7 +43,10 @@ struct draw_params
        std::shared_ptr<device_buffer>                  local_key;\r
        std::shared_ptr<device_buffer>                  layer_key;\r
 \r
-       draw_params() : blend_mode(blend_mode::normal){}\r
+       draw_params() \r
+               : blend_mode(blend_mode::normal)\r
+       {\r
+       }\r
 };\r
 \r
 class image_kernel : boost::noncopyable\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 302d7af5e681f458c788391871cb0cf41abf5356..393c8a7140f6383df22c486dadb3951f72bc459d 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -145,37 +145,34 @@ private:
                        return;\r
 \r
                std::shared_ptr<device_buffer> local_key_buffer;\r
+               std::shared_ptr<device_buffer> local_mix_buffer;\r
                                \r
                if(layer.blend_mode != blend_mode::normal && layer.items.size() > 1)\r
                {\r
                        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
-                                               \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
+                               draw_item(std::move(item), layer_draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);    \r
+               \r
+                       draw_device_buffer(layer_draw_buffer, std::move(local_mix_buffer), blend_mode::normal);                                                 \r
+                       draw_device_buffer(draw_buffer, std::move(layer_draw_buffer), layer.blend_mode);\r
                }\r
                else // fast path\r
                {\r
                        BOOST_FOREACH(auto& item, layer.items)          \r
-                               draw_item(std::move(item), draw_buffer, local_key_buffer, layer_key_buffer);            \r
+                               draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer);          \r
+                                       \r
+                       draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
                }                                       \r
-               \r
+\r
                std::swap(local_key_buffer, layer_key_buffer);\r
        }\r
 \r
        void draw_item(item&&                                                   item, \r
                                   safe_ptr<device_buffer>&                     draw_buffer, \r
+                                  std::shared_ptr<device_buffer>&      layer_key_buffer, \r
                                   std::shared_ptr<device_buffer>&      local_key_buffer, \r
-                                  std::shared_ptr<device_buffer>&      layer_key_buffer)\r
+                                  std::shared_ptr<device_buffer>&      local_mix_buffer)\r
        {                       \r
                draw_params draw_params;\r
                draw_params.pix_desc                            = std::move(item.pix_desc);\r
@@ -193,8 +190,22 @@ private:
 \r
                        kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }\r
+               else if(item.transform.is_mix)\r
+               {\r
+                       local_mix_buffer = local_mix_buffer ? local_mix_buffer : create_device_buffer(4);\r
+\r
+                       draw_params.background                  = local_mix_buffer;\r
+                       draw_params.local_key                   = std::move(local_key_buffer);\r
+                       draw_params.layer_key                   = layer_key_buffer;\r
+\r
+                       draw_params.blend_mode                  = blend_mode::mix;\r
+\r
+                       kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+               }\r
                else\r
                {\r
+                       draw_device_buffer(draw_buffer, std::move(local_mix_buffer), blend_mode::normal);\r
+                       \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
@@ -202,6 +213,22 @@ private:
                        kernel_.draw(channel_.ogl(), std::move(draw_params));\r
                }       \r
        }\r
+\r
+       void draw_device_buffer(safe_ptr<device_buffer>& draw_buffer, std::shared_ptr<device_buffer>&& source_buffer, blend_mode::type blend_mode = blend_mode::normal)\r
+       {\r
+               if(!source_buffer)\r
+                       return;\r
+\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(source_buffer->width(), source_buffer->height(), 4));\r
+               draw_params.textures                    = list_of(source_buffer);\r
+               draw_params.transform                   = frame_transform();\r
+               draw_params.blend_mode                  = blend_mode;\r
+               draw_params.background                  = draw_buffer;\r
+\r
+               kernel_.draw(channel_.ogl(), std::move(draw_params));\r
+       }\r
                        \r
        safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/image_shader.cpp
index d9b83877f74da3c52da6e0e34b8d98fa86d42d2e..85ceb4cca1ccdd2e7bd1529a7155a6ea74f75dfe 100644 (file)
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/image_shader.cpp
@@ -69,7 +69,11 @@ std::string get_blend_color_func()
        "                                                                                                                                                                       \n"                                                                                                                                                       \r
        "vec4 blend(vec4 fore)                                                                                                                          \n"\r
        "{                                                                                                                                                                      \n"\r
-       "   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;                                          \n"\r
+       "   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;                                          \n"     \r
+       "                                                                                                                                                                       \n"             \r
+       "       if(blend_mode == 29) // mix                                                                                                             \n"\r
+       "               return fore + back;                                                                                                                     \n"\r
+       "                                                                                                                                                                       \n"             \r
        "       fore.rgb = get_blend_color(back.rgb, fore.rgb);                                                                 \n"\r
        "       return fore + (1.0-fore.a)*back;                                                                                                \n"\r
        "}                                                                                                                                                                      \n";                    \r
@@ -115,6 +119,7 @@ std::string get_fragment(bool blend_modes)
        "uniform bool           has_local_key;                                                                                                  \n"\r
        "uniform bool           has_layer_key;                                                                                                  \n"\r
        "uniform int            blend_mode;                                                                                                             \n"\r
+       "uniform int            alpha_mode;                                                                                                             \n"\r
        "uniform int            pixel_format;                                                                                                   \n"\r
        "                                                                                                                                                                       \n"\r
        "uniform float          opacity;                                                                                                                \n"\r

diff --git a/core/producer/frame/frame_transform.cpp b/core/producer/frame/frame_transform.cpp
index 60d93a1aaa8b4424efc63701ff65b646c93f74d0..a608973ab6acce6b5f2669960cde72476c4c96eb 100644 (file)
--- a/core/producer/frame/frame_transform.cpp
+++ b/core/producer/frame/frame_transform.cpp
@@ -34,6 +34,7 @@ frame_transform::frame_transform()
        , saturation(1.0)\r
        , field_mode(field_mode::progressive)\r
        , is_key(false)\r
+       , is_mix(false)\r
 {\r
        std::fill(fill_translation.begin(), fill_translation.end(), 0.0);\r
        std::fill(fill_scale.begin(), fill_scale.end(), 1.0);\r
@@ -63,6 +64,7 @@ frame_transform& frame_transform::operator*=(const frame_transform &other)
        levels.gamma                    *= other.levels.gamma;\r
        field_mode                               = static_cast<field_mode::type>(field_mode & other.field_mode);\r
        is_key                                  |= other.is_key;\r
+       is_mix                                  |= other.is_mix;\r
        return *this;\r
 }\r
 \r
@@ -99,6 +101,7 @@ frame_transform tween(double time, const frame_transform& source, const frame_tr
        result.levels.gamma                     = do_tween(time, source.levels.gamma,                   dest.levels.gamma,                      duration, tweener);\r
        result.field_mode                       = static_cast<field_mode::type>(source.field_mode & dest.field_mode);\r
        result.is_key                           = source.is_key | dest.is_key;\r
+       result.is_mix                           = source.is_mix | dest.is_mix;\r
        \r
        return result;\r
 }\r

diff --git a/core/producer/frame/frame_transform.h b/core/producer/frame/frame_transform.h
index 0fde0ec4459cb302f8df1de1ada0260a75f658f1..d20f774ff18f1fb5bba77aeda3abbf2e663efb89 100644 (file)
--- a/core/producer/frame/frame_transform.h
+++ b/core/producer/frame/frame_transform.h
@@ -65,6 +65,7 @@ public:
 \r
        field_mode::type                field_mode;\r
        bool                                    is_key;\r
+       bool                                    is_mix;\r
        \r
        frame_transform& frame_transform::operator*=(const frame_transform &other);\r
        frame_transform frame_transform::operator*(const frame_transform &other) const;\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index ccbfa757c99e0a6b3678c12c9b45a212b43f44fb..24cf9287533810a4854657b8f5cab816ac344fb8 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -132,14 +132,18 @@ struct transition_producer : public frame_producer
                d_frame1->get_frame_transform().volume = 0.0;\r
                d_frame2->get_frame_transform().volume = delta2;\r
 \r
-               //if(info_.type == transition::mix)\r
-               //{\r
-               //      d_frame1->get_frame_transform().set_opacity(delta1);    \r
-               //      d_frame2->get_frame_transform().set_opacity(delta2);\r
-\r
-               //      s_frame1->get_frame_transform().set_opacity(1.0-delta1);        \r
-               //      s_frame2->get_frame_transform().set_opacity(1.0-delta2);                \r
-               //}\r
+               if(info_.type == transition::mix)\r
+               {\r
+                       d_frame1->get_frame_transform().opacity = delta1;       \r
+                       d_frame1->get_frame_transform().is_mix = true;\r
+                       d_frame2->get_frame_transform().opacity = delta2;\r
+                       d_frame2->get_frame_transform().is_mix = true;\r
+\r
+                       s_frame1->get_frame_transform().opacity = 1.0-delta1;   \r
+                       s_frame1->get_frame_transform().is_mix = true;\r
+                       s_frame2->get_frame_transform().opacity = 1.0-delta2;   \r
+                       s_frame2->get_frame_transform().is_mix = true;\r
+               }\r
                if(info_.type == transition::slide)\r
                {\r
                        d_frame1->get_frame_transform().fill_translation[0] = (-1.0+delta1)*dir;        \r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 36a38ca7a9272755b5d4e3f581ee49a9edaf9ee4..a24afe7457c5b01a4c8bc1d07187a214d66da0b3 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -41,6 +41,7 @@
           <external-key>true</external-key>\r
         </decklink>\r
         <screen>\r
+          <key-only>true</key-only>\r
           <device>1</device>\r
         </screen>\r
       </consumers>\r