2.0. image_mixer: - Renderer is now properly and fully pre-multiplied. - Removed...

[casparcg] / core / producer / transition / transition_producer.cpp

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index ca8092644a9d3fb0454c0cf5832057a1915e393a..6fe58ec62ebc9578d7e7ee0c8fd79a0165b8efee 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -65,7 +65,7 @@ struct transition_producer : public frame_producer
 \r
        virtual safe_ptr<basic_frame> receive(int hints)\r
        {\r
-               if(current_frame_++ >= info_.duration)\r
+               if(++current_frame_ >= info_.duration)\r
                        return basic_frame::eof();\r
                \r
                auto dest = basic_frame::empty();\r
@@ -129,15 +129,15 @@ struct transition_producer : public frame_producer
                d_frame1->get_audio_transform().set_has_audio(false);\r
                d_frame2->get_audio_transform().set_gain(delta2);\r
 \r
-               if(info_.type == transition::mix)\r
-               {\r
-                       d_frame1->get_image_transform().set_opacity(delta1);    \r
-                       d_frame2->get_image_transform().set_opacity(delta2);\r
+               //if(info_.type == transition::mix)\r
+               //{\r
+               //      d_frame1->get_image_transform().set_opacity(delta1);    \r
+               //      d_frame2->get_image_transform().set_opacity(delta2);\r
 \r
-                       s_frame1->get_image_transform().set_opacity(1.0-delta1);        \r
-                       s_frame2->get_image_transform().set_opacity(1.0-delta2);                \r
-               }\r
-               else if(info_.type == transition::slide)\r
+               //      s_frame1->get_image_transform().set_opacity(1.0-delta1);        \r
+               //      s_frame2->get_image_transform().set_opacity(1.0-delta2);                \r
+               //}\r
+               if(info_.type == transition::slide)\r
                {\r
                        d_frame1->get_image_transform().set_fill_translation((-1.0+delta1)*dir, 0.0);   \r
                        d_frame2->get_image_transform().set_fill_translation((-1.0+delta2)*dir, 0.0);           \r