#include <core/video_format.h>\r
\r
#include <core/producer/frame/basic_frame.h>\r
-#include <core/producer/frame/image_transform.h>\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
\r
#include <tbb/parallel_invoke.h>\r
\r
+#include <boost/assign.hpp>\r
+\r
+using namespace boost::assign;\r
+\r
namespace caspar { namespace core { \r
\r
struct transition_producer : public frame_producer\r
{ \r
- const video_mode::type mode_;\r
+ const field_mode::type mode_;\r
unsigned int current_frame_;\r
\r
const transition_info info_;\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
+ explicit transition_producer(const field_mode::type& mode, const safe_ptr<frame_producer>& dest, const transition_info& info) \r
: mode_(mode)\r
, current_frame_(0)\r
, info_(info)\r
\r
virtual safe_ptr<basic_frame> receive(int hints)\r
{\r
- if(current_frame_++ >= info_.duration)\r
+ if(++current_frame_ >= info_.duration)\r
return basic_frame::eof();\r
\r
auto dest = basic_frame::empty();\r
source = source_producer_->last_frame();\r
});\r
\r
- return last_frame_ = compose(dest, source);\r
+ return compose(dest, source);\r
}\r
\r
virtual safe_ptr<core::basic_frame> last_frame() const\r
auto s_frame1 = make_safe<basic_frame>(src_frame);\r
auto s_frame2 = make_safe<basic_frame>(src_frame);\r
\r
- s_frame1->get_audio_transform().set_has_audio(false);\r
- s_frame2->get_audio_transform().set_gain(1.0-delta2);\r
+ s_frame1->get_frame_transform().volume = 0.0;\r
+ s_frame2->get_frame_transform().volume = 1.0-delta2;\r
\r
auto d_frame1 = make_safe<basic_frame>(dest_frame);\r
auto d_frame2 = make_safe<basic_frame>(dest_frame);\r
\r
- d_frame1->get_audio_transform().set_has_audio(false);\r
- d_frame2->get_audio_transform().set_gain(delta2);\r
+ d_frame1->get_frame_transform().volume = 0.0;\r
+ d_frame2->get_frame_transform().volume = delta2;\r
\r
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
-\r
- //s_frame1->get_image_transform().set_opacity(1.0-delta1); \r
- //s_frame2->get_image_transform().set_opacity(1.0-delta2); \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
}\r
- else if(info_.type == transition::slide)\r
+ if(info_.type == transition::slide)\r
{\r
- d_frame1->get_image_transform().set_fill_translation((-1.0+delta1)*dir, 0.0); \r
- d_frame2->get_image_transform().set_fill_translation((-1.0+delta2)*dir, 0.0); \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
}\r
else if(info_.type == transition::push)\r
{\r
- d_frame1->get_image_transform().set_fill_translation((-1.0+delta1)*dir, 0.0);\r
- d_frame2->get_image_transform().set_fill_translation((-1.0+delta2)*dir, 0.0);\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
\r
- s_frame1->get_image_transform().set_fill_translation((0.0+delta1)*dir, 0.0); \r
- s_frame2->get_image_transform().set_fill_translation((0.0+delta2)*dir, 0.0); \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
}\r
else if(info_.type == transition::wipe) \r
{\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
+ d_frame1->get_frame_transform().clip_scale[0] = delta1; \r
+ d_frame2->get_frame_transform().clip_scale[0] = delta2; \r
}\r
\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
+ const auto s_frame = s_frame1->get_frame_transform() == s_frame2->get_frame_transform() ? s_frame2 : basic_frame::interlace(s_frame1, s_frame2, mode_);\r
+ const auto d_frame = d_frame1->get_frame_transform() == d_frame2->get_frame_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
+ last_frame_ = basic_frame::combine(s_frame2, d_frame2);\r
\r
- return frame;\r
+ return basic_frame::combine(s_frame, d_frame);\r
}\r
};\r
\r
-safe_ptr<frame_producer> create_transition_producer(const video_mode::type& mode, const safe_ptr<frame_producer>& destination, const transition_info& info)\r
+safe_ptr<frame_producer> create_transition_producer(const field_mode::type& mode, const safe_ptr<frame_producer>& destination, const transition_info& info)\r
{\r
return make_safe<transition_producer>(mode, destination, info);\r
}\r