* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
*\r
*/\r
+// TODO: Try to recover consumer from bad_alloc...\r
#include "../StdAfx.h"\r
\r
#ifdef _MSC_VER\r
#include <common/utility/timer.h>\r
#include <common/memory/memshfl.h>\r
\r
+#include <tbb/mutex.h>\r
+\r
namespace caspar { namespace core {\r
+\r
+class deferred_key_read_Frame : public core::read_frame\r
+{\r
+ ogl_device& ogl_;\r
+ safe_ptr<read_frame> fill_;\r
+ std::shared_ptr<host_buffer> key_;\r
+ tbb::mutex mutex_;\r
+public:\r
+ deferred_key_read_Frame(ogl_device& ogl, const safe_ptr<read_frame>& fill)\r
+ : ogl_(ogl)\r
+ , fill_(fill)\r
+ {\r
+ }\r
+\r
+ virtual const boost::iterator_range<const uint8_t*> image_data()\r
+ {\r
+ tbb::mutex::scoped_lock lock(mutex_);\r
+ if(!key_)\r
+ {\r
+ key_ = ogl_.create_host_buffer(fill_->image_data().size(), host_buffer::write_only); \r
+ fast_memsfhl(key_->data(), fill_->image_data().begin(), fill_->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
+ }\r
+\r
+ auto ptr = static_cast<const uint8_t*>(key_->data());\r
+ return boost::iterator_range<const uint8_t*>(ptr, ptr + key_->size());\r
+ }\r
+\r
+ virtual const boost::iterator_range<const int16_t*> audio_data()\r
+ {\r
+ return fill_->audio_data();\r
+ } \r
+};\r
\r
struct output::implementation\r
{ \r
- typedef std::pair<safe_ptr<const read_frame>, safe_ptr<const read_frame>> fill_and_key;\r
+ typedef std::pair<safe_ptr<read_frame>, safe_ptr<read_frame>> fill_and_key;\r
\r
video_channel_context& channel_;\r
\r
\r
void add(int index, safe_ptr<frame_consumer>&& consumer)\r
{ \r
- consumer->initialize(channel_.get_format_desc());\r
channel_.execution().invoke([&]\r
{\r
consumers_.erase(index);\r
+ });\r
+\r
+ consumer->initialize(channel_.get_format_desc());\r
+\r
+ channel_.execution().invoke([&]\r
+ {\r
consumers_.insert(std::make_pair(index, consumer));\r
\r
CASPAR_LOG(info) << print() << L" " << consumer->print() << L" Added.";\r
}\r
\r
void execute(const safe_ptr<read_frame>& frame)\r
- { \r
- try\r
- { \r
- if(!has_synchronization_clock())\r
- timer_.tick(1.0/channel_.get_format_desc().fps);\r
- \r
- auto fill = frame;\r
- auto key = get_key_frame(frame);\r
+ { \r
+ if(!has_synchronization_clock())\r
+ timer_.tick(1.0/channel_.get_format_desc().fps);\r
\r
- auto it = consumers_.begin();\r
- while(it != consumers_.end())\r
- {\r
- try\r
- {\r
- auto consumer = it->second;\r
-\r
- if(consumer->get_video_format_desc() != channel_.get_format_desc())\r
- consumer->initialize(channel_.get_format_desc());\r
-\r
- auto frame = consumer->key_only() ? key : fill;\r
-\r
- if(static_cast<size_t>(frame->image_data().size()) == consumer->get_video_format_desc().size)\r
- consumer->send(frame);\r
-\r
- ++it;\r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- CASPAR_LOG(error) << print() << L" " << it->second->print() << L" Removed.";\r
- consumers_.erase(it++);\r
- }\r
- }\r
+ if(frame->image_size() != channel_.get_format_desc().size)\r
+ {\r
+ timer_.tick(1.0/channel_.get_format_desc().fps);\r
+ return;\r
}\r
- catch(...)\r
+\r
+ auto fill = frame;\r
+ auto key = make_safe<deferred_key_read_Frame>(channel_.ogl(), frame);\r
+\r
+ auto it = consumers_.begin();\r
+ while(it != consumers_.end())\r
{\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
+ auto consumer = it->second;\r
+\r
+ if(consumer->get_video_format_desc() != channel_.get_format_desc())\r
+ consumer->initialize(channel_.get_format_desc());\r
+\r
+ if(consumer->send(consumer->key_only() ? key : fill))\r
+ ++it;\r
+ else\r
+ consumers_.erase(it++);\r
}\r
}\r
\r
return p.second->has_synchronization_clock();\r
});\r
}\r
-\r
- safe_ptr<const read_frame> get_key_frame(const safe_ptr<const read_frame>& frame)\r
- {\r
- const bool has_key_only = std::any_of(consumers_.begin(), consumers_.end(), [](const decltype(*consumers_.begin())& p)\r
- {\r
- return p.second->key_only();\r
- });\r
-\r
- if(has_key_only)\r
- {\r
- // Currently do key_only transform on cpu. Unsure if the extra 400MB/s (1080p50) overhead is worth it to do it on gpu.\r
- auto key_data = channel_.ogl().create_host_buffer(frame->image_data().size(), host_buffer::write_only); \r
- fast_memsfhl(key_data->data(), frame->image_data().begin(), frame->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
- std::vector<int16_t> audio_data(frame->audio_data().begin(), frame->audio_data().end());\r
- return make_safe<read_frame>(std::move(key_data), std::move(audio_data));\r
- }\r
- \r
- return make_safe<read_frame>();\r
- }\r
\r
std::wstring print() const\r
{\r
projects / casparcg / blobdiff