2.1.0: -frame_transform: Split frame_transform into image and audio-transforms.

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

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index eaac208da91f0484f49de773c55843f30d0704b2..e3056c75f668e6d18106ded08c8628d7ac354eb7 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -32,21 +32,25 @@
 \r
 namespace caspar { namespace core {    \r
 \r
-struct transition_producer : public frame_producer\r
+class transition_producer : public frame_producer\r
 {      \r
        monitor::basic_subject                          event_subject_;\r
        const field_mode                                        mode_;\r
        int                                                                     current_frame_;\r
        \r
        const transition_info                           info_;\r
+\r
+       spl::shared_ptr<draw_frame>                     last_frame_;\r
        \r
        spl::shared_ptr<frame_producer>         dest_producer_;\r
        spl::shared_ptr<frame_producer>         source_producer_;\r
                \r
+public:\r
        explicit transition_producer(const field_mode& mode, const spl::shared_ptr<frame_producer>& dest, const transition_info& info) \r
                : mode_(mode)\r
                , current_frame_(0)\r
                , info_(info)\r
+               , last_frame_(draw_frame::empty())\r
                , dest_producer_(dest)\r
                , source_producer_(frame_producer::empty())\r
        {\r
@@ -100,6 +104,11 @@ struct transition_producer : public frame_producer
 \r
                return compose(dest, source);\r
        }\r
+\r
+       virtual spl::shared_ptr<draw_frame> last_frame() const override\r
+       {\r
+               return dest_producer_->last_frame();\r
+       }\r
        \r
        virtual uint32_t nb_frames() const override\r
        {\r
@@ -135,47 +144,47 @@ struct transition_producer : public frame_producer
                \r
                // For interlaced transitions. Seperate fields into seperate frames which are transitioned accordingly.\r
                \r
-               src_frame->get_frame_transform().volume = 1.0-delta2;\r
+               src_frame->frame_transform().audio_transform.volume = 1.0-delta2;\r
                auto s_frame1 = spl::make_shared<draw_frame>(src_frame);\r
                auto s_frame2 = spl::make_shared<draw_frame>(src_frame);\r
                \r
-               dest_frame->get_frame_transform().volume = delta2;\r
+               dest_frame->frame_transform().audio_transform.volume = delta2;\r
                auto d_frame1 = spl::make_shared<draw_frame>(dest_frame);\r
                auto d_frame2 = spl::make_shared<draw_frame>(dest_frame);\r
                \r
                if(info_.type == transition_type::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
+                       d_frame1->frame_transform().image_transform.opacity = delta1;   \r
+                       d_frame1->frame_transform().image_transform.is_mix = true;\r
+                       d_frame2->frame_transform().image_transform.opacity = delta2;\r
+                       d_frame2->frame_transform().image_transform.is_mix = true;\r
+\r
+                       s_frame1->frame_transform().image_transform.opacity = 1.0-delta1;       \r
+                       s_frame1->frame_transform().image_transform.is_mix = true;\r
+                       s_frame2->frame_transform().image_transform.opacity = 1.0-delta2;       \r
+                       s_frame2->frame_transform().image_transform.is_mix = true;\r
                }\r
                if(info_.type == transition_type::slide)\r
                {\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
+                       d_frame1->frame_transform().image_transform.fill_translation[0] = (-1.0+delta1)*dir;    \r
+                       d_frame2->frame_transform().image_transform.fill_translation[0] = (-1.0+delta2)*dir;            \r
                }\r
                else if(info_.type == transition_type::push)\r
                {\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
+                       d_frame1->frame_transform().image_transform.fill_translation[0] = (-1.0+delta1)*dir;\r
+                       d_frame2->frame_transform().image_transform.fill_translation[0] = (-1.0+delta2)*dir;\r
 \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
+                       s_frame1->frame_transform().image_transform.fill_translation[0] = (0.0+delta1)*dir;     \r
+                       s_frame2->frame_transform().image_transform.fill_translation[0] = (0.0+delta2)*dir;             \r
                }\r
                else if(info_.type == transition_type::wipe)            \r
                {\r
-                       d_frame1->get_frame_transform().clip_scale[0] = delta1; \r
-                       d_frame2->get_frame_transform().clip_scale[0] = delta2;                 \r
+                       d_frame1->frame_transform().image_transform.clip_scale[0] = delta1;     \r
+                       d_frame2->frame_transform().image_transform.clip_scale[0] = delta2;                     \r
                }\r
                                \r
-               const auto s_frame = s_frame1->get_frame_transform() == s_frame2->get_frame_transform() ? s_frame2 : draw_frame::interlace(s_frame1, s_frame2, mode_);\r
-               const auto d_frame = d_frame1->get_frame_transform() == d_frame2->get_frame_transform() ? d_frame2 : draw_frame::interlace(d_frame1, d_frame2, mode_);\r
+               const auto s_frame = s_frame1->frame_transform() == s_frame2->frame_transform() ? s_frame2 : draw_frame::interlace(s_frame1, s_frame2, mode_);\r
+               const auto d_frame = d_frame1->frame_transform() == d_frame2->frame_transform() ? d_frame2 : draw_frame::interlace(d_frame1, d_frame2, mode_);\r
                \r
                return draw_frame::over(s_frame, d_frame);\r
        }\r