2.0. Fixed mix transition.

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

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 204eb084f21bde3eacf938df49665e1984b13bcd..24cf9287533810a4854657b8f5cab816ac344fb8 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -24,11 +24,14 @@
 #include <core/video_format.h>\r
 \r
 #include <core/producer/frame/basic_frame.h>\r
-#include <core/producer/frame/image_transform.h>\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
 \r
 #include <tbb/parallel_invoke.h>\r
 \r
+#include <boost/assign.hpp>\r
+\r
+using namespace boost::assign;\r
+\r
 namespace caspar { namespace core {    \r
 \r
 struct transition_producer : public frame_producer\r
@@ -120,44 +123,48 @@ struct transition_producer : public frame_producer
                auto s_frame1 = make_safe<basic_frame>(src_frame);\r
                auto s_frame2 = make_safe<basic_frame>(src_frame);\r
 \r
-               s_frame1->get_audio_transform().set_has_audio(false);\r
-               s_frame2->get_audio_transform().set_volume(1.0-delta2);\r
+               s_frame1->get_frame_transform().volume = 0.0;\r
+               s_frame2->get_frame_transform().volume = 1.0-delta2;\r
 \r
                auto d_frame1 = make_safe<basic_frame>(dest_frame);\r
                auto d_frame2 = make_safe<basic_frame>(dest_frame);\r
                \r
-               d_frame1->get_audio_transform().set_has_audio(false);\r
-               d_frame2->get_audio_transform().set_volume(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
+               d_frame1->get_frame_transform().volume = 0.0;\r
+               d_frame2->get_frame_transform().volume = 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
+               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_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
+                       d_frame1->get_frame_transform().fill_translation[0] = (-1.0+delta1)*dir;        \r
+                       d_frame2->get_frame_transform().fill_translation[0] = (-1.0+delta2)*dir;                \r
                }\r
                else if(info_.type == transition::push)\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
+                       d_frame1->get_frame_transform().fill_translation[0] = (-1.0+delta1)*dir;\r
+                       d_frame2->get_frame_transform().fill_translation[0] = (-1.0+delta2)*dir;\r
 \r
-                       s_frame1->get_image_transform().set_fill_translation((0.0+delta1)*dir, 0.0);    \r
-                       s_frame2->get_image_transform().set_fill_translation((0.0+delta2)*dir, 0.0);            \r
+                       s_frame1->get_frame_transform().fill_translation[0] = (0.0+delta1)*dir; \r
+                       s_frame2->get_frame_transform().fill_translation[0] = (0.0+delta2)*dir;         \r
                }\r
                else if(info_.type == transition::wipe)         \r
                {\r
-                       d_frame1->get_image_transform().set_clip_scale(delta1, 1.0);    \r
-                       d_frame2->get_image_transform().set_clip_scale(delta2, 1.0);                    \r
+                       d_frame1->get_frame_transform().clip_scale[0] = delta1; \r
+                       d_frame2->get_frame_transform().clip_scale[0] = delta2;                 \r
                }\r
                                \r
-               const auto s_frame = s_frame1->get_image_transform() == s_frame2->get_image_transform() ? s_frame2 : basic_frame::interlace(s_frame1, s_frame2, mode_);\r
-               const auto d_frame = d_frame1->get_image_transform() == d_frame2->get_image_transform() ? d_frame2 : basic_frame::interlace(d_frame1, d_frame2, mode_);\r
+               const auto s_frame = s_frame1->get_frame_transform() == s_frame2->get_frame_transform() ? s_frame2 : basic_frame::interlace(s_frame1, s_frame2, mode_);\r
+               const auto d_frame = d_frame1->get_frame_transform() == d_frame2->get_frame_transform() ? d_frame2 : basic_frame::interlace(d_frame1, d_frame2, mode_);\r
                \r
                last_frame_ = basic_frame::combine(s_frame2, d_frame2);\r
 \r