git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

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

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index f1a03db4fd0865ff2c9964c3eceda33d7725d7ec..66c79b9ee3bfbc03d054b3ad951c5d39e034686e 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -27,19 +27,21 @@
 #include <core/producer/frame/image_transform.h>\r
 #include <core/producer/frame/audio_transform.h>\r
 \r
+#include <tbb/parallel_invoke.h>\r
+\r
 namespace caspar { namespace core {    \r
 \r
 struct transition_producer : public frame_producer\r
 {      \r
        const video_mode::type          mode_;\r
-       uint32_t                                        current_frame_;\r
+       unsigned int                            current_frame_;\r
        \r
        const transition_info           info_;\r
        \r
        safe_ptr<frame_producer>        dest_producer_;\r
        safe_ptr<frame_producer>        source_producer_;\r
-       safe_ptr<basic_frame>           last_dest_;\r
-       safe_ptr<basic_frame>           last_source_;\r
+\r
+       safe_ptr<basic_frame>           last_frame_;\r
                \r
        explicit transition_producer(const video_mode::type& mode, const safe_ptr<frame_producer>& dest, const transition_info& info) \r
                : mode_(mode)\r
@@ -47,8 +49,7 @@ struct transition_producer : public frame_producer
                , info_(info)\r
                , dest_producer_(dest)\r
                , source_producer_(frame_producer::empty())\r
-               , last_dest_(core::basic_frame::empty())\r
-               , last_source_(core::basic_frame::empty()){}\r
+               , last_frame_(basic_frame::empty()){}\r
        \r
        // frame_producer\r
 \r
@@ -62,36 +63,46 @@ struct transition_producer : public frame_producer
                source_producer_ = producer;\r
        }\r
 \r
-       virtual safe_ptr<basic_frame> receive()\r
+       virtual safe_ptr<basic_frame> receive(int hints)\r
        {\r
                if(current_frame_++ >= info_.duration)\r
                        return basic_frame::eof();\r
                \r
-               tbb::parallel_invoke\r
-               (\r
-                       [&]{last_dest_   = receive_and_follow_w_last(dest_producer_, last_dest_);},\r
-                       [&]{last_source_ = receive_and_follow_w_last(source_producer_, last_source_);}\r
-               );\r
+               auto dest = basic_frame::empty();\r
+               auto source = basic_frame::empty();\r
 \r
-               return compose(last_dest_, last_source_);\r
+               tbb::parallel_invoke(\r
+               [&]\r
+               {\r
+                       dest = receive_and_follow(dest_producer_, hints);\r
+                       if(dest == core::basic_frame::late())\r
+                               dest = dest_producer_->last_frame();\r
+               },\r
+               [&]\r
+               {\r
+                       source = receive_and_follow(source_producer_, hints);\r
+                       if(source == core::basic_frame::late())\r
+                               source = source_producer_->last_frame();\r
+               });\r
+\r
+               return last_frame_ = compose(dest, source);\r
        }\r
 \r
-       virtual std::wstring print() const\r
+       virtual safe_ptr<core::basic_frame> last_frame() const\r
        {\r
-               return L"transition";\r
+               return disable_audio(last_frame_);\r
        }\r
 \r
-       safe_ptr<basic_frame> receive_and_follow_w_last(safe_ptr<frame_producer>& producer, safe_ptr<basic_frame> last_frame)\r
+       virtual int64_t nb_frames() const \r
        {\r
-               auto frame = core::receive_and_follow(producer);\r
-               if(frame == basic_frame::late())\r
-               {\r
-                       last_frame->get_audio_transform().set_has_audio(false);\r
-                       frame = last_frame;\r
-               }\r
-               return frame;\r
+               return get_following_producer()->nb_frames();\r
        }\r
 \r
+       virtual std::wstring print() const\r
+       {\r
+               return L"transition[" + source_producer_->print() + L"|" + dest_producer_->print() + L"]";\r
+       }\r
+       \r
        // transition_producer\r
                                                \r
        safe_ptr<basic_frame> compose(const safe_ptr<basic_frame>& dest_frame, const safe_ptr<basic_frame>& src_frame) \r
@@ -99,10 +110,10 @@ struct transition_producer : public frame_producer
                if(info_.type == transition::cut)               \r
                        return src_frame;\r
                                                                                \r
-               double delta1 = info_.tweener(current_frame_*2-1, 0.0, 1.0, info_.duration*2);\r
-               double delta2 = info_.tweener(current_frame_*2, 0.0, 1.0, info_.duration*2);  \r
+               const double delta1 = info_.tweener(current_frame_*2-1, 0.0, 1.0, info_.duration*2);\r
+               const double delta2 = info_.tweener(current_frame_*2, 0.0, 1.0, info_.duration*2);  \r
 \r
-               double dir = info_.direction == transition_direction::from_left ? 1.0 : -1.0;           \r
+               const double dir = info_.direction == transition_direction::from_left ? 1.0 : -1.0;             \r
                \r
                // For interlaced transitions. Seperate fields into seperate frames which are transitioned accordingly.\r
                \r
@@ -121,7 +132,10 @@ struct transition_producer : public frame_producer
                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_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
                {\r
@@ -138,12 +152,12 @@ struct transition_producer : public frame_producer
                }\r
                else if(info_.type == transition::wipe)         \r
                {\r
-                       d_frame1->get_image_transform().set_key_scale(delta1, 1.0);     \r
-                       d_frame2->get_image_transform().set_key_scale(delta2, 1.0);                     \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
                }\r
                                \r
-               auto s_frame = s_frame1->get_image_transform() == s_frame2->get_image_transform() ? s_frame2 : basic_frame::interlace(s_frame1, s_frame2, mode_);\r
-               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_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
                \r
                return basic_frame::combine(s_frame, d_frame);\r
        }\r