2.0.0.2: Added channel wise mixer animations.

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

diff --git a/mixer/frame_mixer_device.cpp b/mixer/frame_mixer_device.cpp
index 6a5f107e99530ca9cca7150d1a1d7ae97ad67001..8aac798f7c66cf1f3caf59a9885f8d9efef0b031 100644 (file)
--- a/mixer/frame_mixer_device.cpp
+++ b/mixer/frame_mixer_device.cpp
@@ -27,6 +27,41 @@
 \r
 namespace caspar { namespace core {\r
        \r
+       \r
+template<typename T>\r
+class basic_animated_value\r
+{\r
+       T source_;\r
+       T dest_;\r
+       int duration_;\r
+       int time_;\r
+public:        \r
+       basic_animated_value()\r
+               : duration_(0)\r
+               , time_(0){}\r
+       basic_animated_value(const T& dest)\r
+               : source_(dest)\r
+               , dest_(dest)\r
+               , duration_(0)\r
+               , time_(0){}\r
+\r
+       basic_animated_value(const T& source, const T& dest, int duration)\r
+               : source_(source)\r
+               , dest_(dest)\r
+               , duration_(duration)\r
+               , time_(0){}\r
+       \r
+       virtual T fetch()\r
+       {\r
+               return lerp(source_, dest_, duration_ < 1 ? 1.0f : static_cast<float>(time_)/static_cast<float>(duration_));\r
+       }\r
+       virtual T fetch_and_tick(int num)\r
+       {                                               \r
+               time_ = std::min(time_+num, duration_);\r
+               return fetch();\r
+       }\r
+};\r
+\r
 struct frame_mixer_device::implementation : boost::noncopyable\r
 {              \r
        const printer                   parent_printer_;\r
@@ -44,8 +79,8 @@ struct frame_mixer_device::implementation : boost::noncopyable
        std::unordered_map<int, image_transform> image_transforms_;\r
        std::unordered_map<int, audio_transform> audio_transforms_;\r
 \r
-       image_transform root_image_transform_;\r
-       audio_transform root_audio_transform_;\r
+       basic_animated_value<image_transform> root_image_transform_;\r
+       basic_animated_value<audio_transform> root_audio_transform_;\r
 \r
        executor executor_;\r
 public:\r
@@ -70,11 +105,14 @@ public:
        {                       \r
                executor_.begin_invoke([=]\r
                {\r
+                       int num = format_desc_.mode == video_mode::progressive ? 1 : 2;\r
+\r
                        perf_timer_.reset();\r
                        auto image = image_mixer_.begin_pass();\r
                        BOOST_FOREACH(auto& frame, frames)\r
                        {\r
-                               image_mixer_.begin(root_image_transform_*image_transforms_[frame->get_layer_index()]);\r
+                               auto transform = root_image_transform_.fetch_and_tick(num)*image_transforms_[frame->get_layer_index()];\r
+                               image_mixer_.begin(transform);\r
                                frame->process_image(image_mixer_);\r
                                image_mixer_.end();\r
                        }\r
@@ -83,7 +121,8 @@ public:
                        auto audio = audio_mixer_.begin_pass();\r
                        BOOST_FOREACH(auto& frame, frames)\r
                        {\r
-                               audio_mixer_.begin(root_audio_transform_*audio_transforms_[frame->get_layer_index()]);\r
+                               auto transform = root_audio_transform_.fetch_and_tick(num)*audio_transforms_[frame->get_layer_index()];\r
+                               audio_mixer_.begin(transform);\r
                                frame->process_audio(audio_mixer_);\r
                                audio_mixer_.end();\r
                        }\r
@@ -137,23 +176,27 @@ public:
                });\r
        }\r
        \r
-       void apply_image_transform(const std::function<image_transform(const image_transform&)> transform, int)\r
+       void apply_image_transform(const std::function<image_transform(const image_transform&)>& transform, int mix_duration)\r
        {\r
                return executor_.invoke([&]\r
                {\r
-                       root_image_transform_ = transform(root_image_transform_);\r
+                       auto src = root_image_transform_.fetch();\r
+                       auto dst = transform(src);\r
+                       root_image_transform_ = basic_animated_value<image_transform>(src, dst, mix_duration);\r
                });\r
        }\r
 \r
-       void apply_audio_transform(const std::function<audio_transform(audio_transform)> transform, int)\r
+       void apply_audio_transform(const std::function<audio_transform(audio_transform)>& transform, int mix_duration)\r
        {\r
                return executor_.invoke([&]\r
                {\r
-                       root_audio_transform_ = transform(root_audio_transform_);\r
+                       auto src = root_audio_transform_.fetch();\r
+                       auto dst = transform(src);\r
+                       root_audio_transform_ = basic_animated_value<audio_transform>(src, dst, mix_duration);\r
                });\r
        }\r
 \r
-       void apply_image_transform(int index, const std::function<image_transform(image_transform)> transform, int)\r
+       void apply_image_transform(int index, const std::function<image_transform(image_transform)>& transform, int)\r
        {\r
                executor_.invoke([&]\r
                {\r
@@ -161,7 +204,7 @@ public:
                });\r
        }\r
 \r
-       void apply_audio_transform(int index, const std::function<audio_transform(audio_transform)> transform, int)\r
+       void apply_audio_transform(int index, const std::function<audio_transform(audio_transform)>& transform, int)\r
        {\r
                executor_.invoke([&]\r
                {\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index c059a9641e128f94ce8d997fe1e3f1751381004b..0d955880db18872ae1ae643885d7548f3a175524 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -179,7 +179,7 @@ bool MixerCommand::DoExecute()
                {\r
                        if(_parameters[1] == L"OPACITY")\r
                        {\r
-                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
                                double value = boost::lexical_cast<double>(_parameters.at(2));\r
                        \r
                                auto transform = [=](image_transform transform) -> image_transform\r
@@ -196,7 +196,7 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"GAIN")\r
                        {\r
-                               int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
+                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
                                double value = boost::lexical_cast<double>(_parameters.at(2));\r
                                \r
                                auto transform = [=](image_transform transform) -> image_transform\r
@@ -213,7 +213,7 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"FILL_RECT")\r
                        {\r
-                               int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
+                               int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
                                double x        = boost::lexical_cast<double>(_parameters.at(2));\r
                                double y        = boost::lexical_cast<double>(_parameters.at(3));\r
                                double x_s      = boost::lexical_cast<double>(_parameters.at(4));\r
@@ -236,7 +236,7 @@ bool MixerCommand::DoExecute()
                        }\r
                        else if(_parameters[1] == L"KEY_RECT")\r
                        {\r
-                               int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
+                               int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
                                double x        = boost::lexical_cast<double>(_parameters.at(2));\r
                                double y        = boost::lexical_cast<double>(_parameters.at(3));\r
                                double x_s      = boost::lexical_cast<double>(_parameters.at(4));\r