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

diff --git a/core/producer/frame/image_transform.cpp b/core/producer/frame/image_transform.cpp
index 23ba503ab17d960328f8a04d487a5cc5589f9224..8fdab4b2ef706e8a57a373716e863815d4ed1cbf 100644 (file)
--- a/core/producer/frame/image_transform.cpp
+++ b/core/producer/frame/image_transform.cpp
@@ -34,7 +34,6 @@ image_transform::image_transform()
        , contrast_(1.0)\r
        , saturation_(1.0)\r
        , is_key_(false)\r
-       , is_atomic_(false)\r
        , blend_mode_(image_transform::blend_mode::normal)\r
 {\r
        std::fill(fill_translation_.begin(), fill_translation_.end(), 0.0);\r
@@ -148,16 +147,6 @@ std::array<double, 2> image_transform::get_clip_scale() const
        return clip_scale_;\r
 }\r
 \r
-void image_transform::set_is_atomic(bool value)\r
-{\r
-       is_atomic_ = value;\r
-}\r
-\r
-bool image_transform::get_is_atomic() const\r
-{\r
-       return is_atomic_;\r
-}\r
-\r
 void image_transform::set_blend_mode(image_transform::blend_mode::type value)\r
 {\r
        blend_mode_ = value;\r
@@ -185,7 +174,6 @@ image_transform& image_transform::operator*=(const image_transform &other)
 \r
        levels_.gamma                   *= other.levels_.gamma;\r
 \r
-       is_atomic_                              |= other.is_atomic_;\r
        is_key_                                 |= other.is_key_;\r
        fill_translation_[0]    += other.fill_translation_[0]*fill_scale_[0];\r
        fill_translation_[1]    += other.fill_translation_[1]*fill_scale_[1];\r
@@ -216,7 +204,6 @@ image_transform tween(double time, const image_transform& source, const image_tr
        image_transform result; \r
        result.set_blend_mode           (std::max(source.get_blend_mode(), dest.get_blend_mode()));\r
        result.set_is_key                       (source.get_is_key() | dest.get_is_key());\r
-       result.set_is_atomic            (source.get_is_atomic() | dest.get_is_atomic());\r
        result.set_gain                         (do_tween(time, source.get_gain(), dest.get_gain(), duration, tweener));\r
        result.set_brightness           (do_tween(time, source.get_brightness(), dest.get_brightness(), duration, tweener));\r
        result.set_contrast                     (do_tween(time, source.get_contrast(), dest.get_contrast(), duration, tweener));\r

diff --git a/core/producer/frame/image_transform.h b/core/producer/frame/image_transform.h
index eb7d83075b07f9f9b79fc5be74e363d8f99ac5c0..1d1e33c5412623f1952974aa19f763e05d89acc5 100644 (file)
--- a/core/producer/frame/image_transform.h
+++ b/core/producer/frame/image_transform.h
@@ -125,9 +125,6 @@ public:
        void set_is_key(bool value);\r
        bool get_is_key() const;\r
 \r
-       void set_is_atomic(bool value);\r
-       bool get_is_atomic() const;\r
-\r
        void set_blend_mode(blend_mode::type value);\r
        blend_mode::type get_blend_mode() const;\r
        \r
@@ -145,7 +142,6 @@ private:
        std::array<double, 2> clip_scale_; \r
        video_mode::type mode_;\r
        bool is_key_;\r
-       bool is_atomic_;\r
        blend_mode::type blend_mode_;\r
 };\r
 \r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 42a7ecb4570d0994f69cb81e16dd31757d7dc1b1..66c79b9ee3bfbc03d054b3ad951c5d39e034686e 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -159,12 +159,7 @@ struct transition_producer : public frame_producer
                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
-               auto frame = basic_frame::combine(s_frame, d_frame);\r
-\r
-               if(info_.type == transition::mix)\r
-                       frame->get_image_transform().set_is_atomic(true);\r
-\r
-               return frame;\r
+               return basic_frame::combine(s_frame, d_frame);\r
        }\r
 };\r
 \r