From bb79328678a8758ed9227e6b436aae5f875fee57 Mon Sep 17 00:00:00 2001 From: Ronag Date: Mon, 15 Aug 2011 18:53:17 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1190 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- core/producer/frame/image_transform.cpp | 13 ------------- core/producer/frame/image_transform.h | 4 ---- core/producer/transition/transition_producer.cpp | 7 +------ 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/core/producer/frame/image_transform.cpp b/core/producer/frame/image_transform.cpp index 23ba503ab..8fdab4b2e 100644 --- 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) , saturation_(1.0) , is_key_(false) - , is_atomic_(false) , blend_mode_(image_transform::blend_mode::normal) { std::fill(fill_translation_.begin(), fill_translation_.end(), 0.0); @@ -148,16 +147,6 @@ std::array image_transform::get_clip_scale() const return clip_scale_; } -void image_transform::set_is_atomic(bool value) -{ - is_atomic_ = value; -} - -bool image_transform::get_is_atomic() const -{ - return is_atomic_; -} - void image_transform::set_blend_mode(image_transform::blend_mode::type value) { blend_mode_ = value; @@ -185,7 +174,6 @@ image_transform& image_transform::operator*=(const image_transform &other) levels_.gamma *= other.levels_.gamma; - is_atomic_ |= other.is_atomic_; is_key_ |= other.is_key_; fill_translation_[0] += other.fill_translation_[0]*fill_scale_[0]; fill_translation_[1] += other.fill_translation_[1]*fill_scale_[1]; @@ -216,7 +204,6 @@ image_transform tween(double time, const image_transform& source, const image_tr image_transform result; result.set_blend_mode (std::max(source.get_blend_mode(), dest.get_blend_mode())); result.set_is_key (source.get_is_key() | dest.get_is_key()); - result.set_is_atomic (source.get_is_atomic() | dest.get_is_atomic()); result.set_gain (do_tween(time, source.get_gain(), dest.get_gain(), duration, tweener)); result.set_brightness (do_tween(time, source.get_brightness(), dest.get_brightness(), duration, tweener)); result.set_contrast (do_tween(time, source.get_contrast(), dest.get_contrast(), duration, tweener)); diff --git a/core/producer/frame/image_transform.h b/core/producer/frame/image_transform.h index eb7d83075..1d1e33c54 100644 --- 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); bool get_is_key() const; - void set_is_atomic(bool value); - bool get_is_atomic() const; - void set_blend_mode(blend_mode::type value); blend_mode::type get_blend_mode() const; @@ -145,7 +142,6 @@ private: std::array clip_scale_; video_mode::type mode_; bool is_key_; - bool is_atomic_; blend_mode::type blend_mode_; }; diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp index 42a7ecb45..66c79b9ee 100644 --- 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_); const auto d_frame = d_frame1->get_image_transform() == d_frame2->get_image_transform() ? d_frame2 : basic_frame::interlace(d_frame1, d_frame2, mode_); - auto frame = basic_frame::combine(s_frame, d_frame); - - if(info_.type == transition::mix) - frame->get_image_transform().set_is_atomic(true); - - return frame; + return basic_frame::combine(s_frame, d_frame); } }; -- 2.39.2