#include <common/exception/exceptions.h>\r
#include <common/concurrency/executor.h>\r
#include <common/utility/tweener.h>\r
-\r
+#include <common/env.h>\r
+#include <common/gl/gl_check.h>\r
\r
#include <core/mixer/read_frame.h>\r
#include <core/mixer/write_frame.h>\r
\r
#include <boost/fusion/container/map.hpp>\r
#include <boost/fusion/include/at_key.hpp>\r
+#include <boost/foreach.hpp>\r
+\r
+#include <tbb/parallel_invoke.h>\r
\r
#include <unordered_map>\r
\r
boost::fusion::map<boost::fusion::pair<core::image_transform, image_transforms>,\r
boost::fusion::pair<core::audio_transform, audio_transforms>> transforms_;\r
\r
- boost::fusion::map<boost::fusion::pair<core::image_transform, tweened_transform<core::image_transform>>,\r
- boost::fusion::pair<core::audio_transform, tweened_transform<core::audio_transform>>> root_transforms_;\r
+ std::queue<std::pair<boost::unique_future<safe_ptr<host_buffer>>, std::vector<int16_t>>> buffer_;\r
+ \r
+ const size_t buffer_size_;\r
+\r
public:\r
implementation(video_channel_context& video_channel) \r
: channel_(video_channel)\r
+ , audio_mixer_(channel_.get_format_desc())\r
, image_mixer_(channel_)\r
+ , buffer_size_(env::properties().get("configuration.producers.buffer-depth", 1))\r
{ \r
- CASPAR_LOG(info) << print() << L" Successfully initialized."; \r
+ CASPAR_LOG(info) << print() << L" Successfully initialized . Buffer-depth: " << buffer_size_; \r
}\r
\r
safe_ptr<read_frame> execute(const std::map<int, safe_ptr<core::basic_frame>>& frames)\r
{ \r
try\r
{\r
- auto image = mix_image(frames);\r
- auto audio = mix_audio(frames);\r
+ decltype(mix_image(frames)) image;\r
+ decltype(mix_audio(frames)) audio;\r
+\r
+ tbb::parallel_invoke\r
+ (\r
+ [&]{image = mix_image(frames);}, \r
+ [&]{audio = mix_audio(frames);}\r
+ );\r
\r
- return make_safe<read_frame>(std::move(image), std::move(audio));\r
+ buffer_.push(std::make_pair(std::move(image), audio));\r
+\r
+ if(buffer_.size()-1 < buffer_size_) \r
+ return make_safe<read_frame>();\r
+ \r
+ auto res = std::move(buffer_.front());\r
+ buffer_.pop();\r
+\r
+ return make_safe<read_frame>(channel_.ogl(), channel_.get_format_desc().size, std::move(res.first.get()), std::move(res.second)); \r
}\r
catch(...)\r
{\r
- channel_.ogl().gc().wait();\r
- image_mixer_ = image_mixer(channel_);\r
- audio_mixer_ = audio_mixer();\r
- channel_.ogl().gc().wait();\r
-\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- return make_safe<read_frame>();\r
- }\r
+ CASPAR_LOG(error) << L"[mixer] Error detected.";\r
+ throw;\r
+ } \r
}\r
- \r
- safe_ptr<core::write_frame> create_frame(void* tag, const core::pixel_format_desc& desc)\r
+ \r
+ safe_ptr<core::write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc)\r
{ \r
return image_mixer_.create_frame(tag, desc);\r
}\r
- \r
- template<typename T> \r
- void set_transform(const T& transform, unsigned int mix_duration, const std::wstring& tween)\r
+\r
+ void reset_transforms()\r
{\r
channel_.execution().invoke([&]\r
{\r
- auto& root = boost::fusion::at_key<T>(root_transforms_);\r
-\r
- auto src = root.fetch();\r
- auto dst = transform;\r
- root = tweened_transform<T>(src, dst, mix_duration, tween);\r
+ boost::fusion::at_key<image_transform>(transforms_).clear();\r
+ boost::fusion::at_key<audio_transform>(transforms_).clear();\r
});\r
}\r
\r
transforms[index] = tweened_transform<T>(src, dst, mix_duration, tween);\r
});\r
}\r
- \r
- template<typename T>\r
- void apply_transform(const std::function<T(const T&)>& transform, unsigned int mix_duration, const std::wstring& tween)\r
- {\r
- return channel_.execution().invoke([&]\r
- {\r
- auto& root = boost::fusion::at_key<T>(root_transforms_);\r
-\r
- auto src = root.fetch();\r
- auto dst = transform(src);\r
- root = tweened_transform<T>(src, dst, mix_duration, tween);\r
- });\r
- }\r
- \r
+ \r
template<typename T>\r
void apply_transform(int index, const std::function<T(T)>& transform, unsigned int mix_duration, const std::wstring& tween)\r
{\r
\r
private:\r
\r
- safe_ptr<host_buffer> mix_image(std::map<int, safe_ptr<core::basic_frame>> frames)\r
+ boost::unique_future<safe_ptr<host_buffer>> mix_image(std::map<int, safe_ptr<core::basic_frame>> frames)\r
{ \r
- auto& root_image_transform = boost::fusion::at_key<core::image_transform>(root_transforms_);\r
auto& image_transforms = boost::fusion::at_key<core::image_transform>(transforms_);\r
\r
BOOST_FOREACH(auto& frame, frames)\r
{\r
image_mixer_.begin_layer();\r
- \r
+\r
+ auto frame1 = make_safe<core::basic_frame>(frame.second);\r
+ frame1->get_image_transform() = image_transforms[frame.first].fetch_and_tick(1);\r
+ \r
if(channel_.get_format_desc().mode != core::video_mode::progressive)\r
{\r
- auto frame1 = make_safe<core::basic_frame>(frame.second);\r
auto frame2 = make_safe<core::basic_frame>(frame.second);\r
- \r
- frame1->get_image_transform() = root_image_transform.fetch_and_tick(1)*image_transforms[frame.first].fetch_and_tick(1);\r
- frame2->get_image_transform() = root_image_transform.fetch_and_tick(1)*image_transforms[frame.first].fetch_and_tick(1);\r
-\r
+ frame2->get_image_transform() = image_transforms[frame.first].fetch_and_tick(1);\r
if(frame1->get_image_transform() != frame2->get_image_transform())\r
- core::basic_frame::interlace(frame1, frame2, channel_.get_format_desc().mode)->accept(image_mixer_);\r
- else\r
- frame2->accept(image_mixer_);\r
- }\r
- else\r
- {\r
- auto frame1 = make_safe<core::basic_frame>(frame.second);\r
- frame1->get_image_transform() = root_image_transform.fetch_and_tick(1)*image_transforms[frame.first].fetch_and_tick(1);\r
- frame1->accept(image_mixer_);\r
+ frame1 = core::basic_frame::interlace(frame1, frame2, channel_.get_format_desc().mode);\r
}\r
\r
+ frame1->accept(image_mixer_);\r
+\r
image_mixer_.end_layer();\r
}\r
\r
\r
std::vector<int16_t> mix_audio(const std::map<int, safe_ptr<core::basic_frame>>& frames)\r
{\r
- auto& root_audio_transform = boost::fusion::at_key<core::audio_transform>(root_transforms_);\r
auto& audio_transforms = boost::fusion::at_key<core::audio_transform>(transforms_);\r
\r
BOOST_FOREACH(auto& frame, frames)\r
const unsigned int num = channel_.get_format_desc().mode == core::video_mode::progressive ? 1 : 2;\r
\r
auto frame1 = make_safe<core::basic_frame>(frame.second);\r
- frame1->get_audio_transform() = root_audio_transform.fetch_and_tick(num)*audio_transforms[frame.first].fetch_and_tick(num);\r
+ frame1->get_audio_transform() = audio_transforms[frame.first].fetch_and_tick(num);\r
frame1->accept(audio_mixer_);\r
}\r
\r
mixer::mixer(video_channel_context& video_channel) : impl_(new implementation(video_channel)){}\r
safe_ptr<core::read_frame> mixer::execute(const std::map<int, safe_ptr<core::basic_frame>>& frames){ return impl_->execute(frames);}\r
core::video_format_desc mixer::get_video_format_desc() const { return impl_->channel_.get_format_desc(); }\r
-safe_ptr<core::write_frame> mixer::create_frame(void* tag, const core::pixel_format_desc& desc){ return impl_->create_frame(tag, desc); } \r
-safe_ptr<core::write_frame> mixer::create_frame(void* tag, size_t width, size_t height, core::pixel_format::type pix_fmt)\r
+safe_ptr<core::write_frame> mixer::create_frame(const void* tag, const core::pixel_format_desc& desc){ return impl_->create_frame(tag, desc); } \r
+safe_ptr<core::write_frame> mixer::create_frame(const void* tag, size_t width, size_t height, core::pixel_format::type pix_fmt)\r
{\r
// Create bgra frame\r
core::pixel_format_desc desc;\r
desc.planes.push_back( core::pixel_format_desc::plane(width, height, 4));\r
return create_frame(tag, desc);\r
}\r
-void mixer::set_image_transform(const core::image_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->set_transform<core::image_transform>(transform, mix_duration, tween);}\r
+void mixer::reset_transforms(){impl_->reset_transforms();}\r
void mixer::set_image_transform(int index, const core::image_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->set_transform<core::image_transform>(index, transform, mix_duration, tween);}\r
-void mixer::set_audio_transform(const core::audio_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->set_transform<core::audio_transform>(transform, mix_duration, tween);}\r
void mixer::set_audio_transform(int index, const core::audio_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->set_transform<core::audio_transform>(index, transform, mix_duration, tween);}\r
-void mixer::apply_image_transform(const std::function<core::image_transform(core::image_transform)>& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform<core::image_transform>(transform, mix_duration, tween);}\r
void mixer::apply_image_transform(int index, const std::function<core::image_transform(core::image_transform)>& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform<core::image_transform>(index, transform, mix_duration, tween);}\r
-void mixer::apply_audio_transform(const std::function<core::audio_transform(core::audio_transform)>& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform<core::audio_transform>(transform, mix_duration, tween);}\r
void mixer::apply_audio_transform(int index, const std::function<core::audio_transform(core::audio_transform)>& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform<core::audio_transform>(index, transform, mix_duration, tween);}\r
\r
}}
\ No newline at end of file
projects / casparcg / blobdiff