X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdecklink%2Fconsumer%2Fdecklink_consumer.cpp;h=7699f7fd846894dcb91150690de41776013fca30;hb=ef45ae47b4f50ef057041b5122d0f34c1659cc11;hp=e513d53c3a08e1dcd88592a61d062a5eee28dc63;hpb=9cd06977daa3c4903be2ba6231fae3b398278544;p=casparcg diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp index e513d53c3..7699f7fd8 100644 --- a/modules/decklink/consumer/decklink_consumer.cpp +++ b/modules/decklink/consumer/decklink_consumer.cpp @@ -35,7 +35,10 @@ #include #include +#include + #include +#include #include #include @@ -46,7 +49,7 @@ struct configuration { size_t device_index; bool embedded_audio; - bool external_key; + bool internal_key; bool low_latency; bool key_only; size_t buffer_depth; @@ -54,37 +57,56 @@ struct configuration configuration() : device_index(1) , embedded_audio(false) - , external_key(false) + , internal_key(false) , low_latency(false) , key_only(false) - , buffer_depth(CONSUMER_BUFFER_DEPTH){} + , buffer_depth(core::consumer_buffer_depth()){} }; -class decklink_frame_adapter : public IDeckLinkVideoFrame +class decklink_frame : public IDeckLinkVideoFrame { - const safe_ptr frame_; - const core::video_format_desc format_desc_; + const std::shared_ptr frame_; + const core::video_format_desc format_desc_; + + bool key_only_; + std::vector> key_data_; public: - decklink_frame_adapter(const safe_ptr& frame, const core::video_format_desc& format_desc) + decklink_frame(const safe_ptr& frame, const core::video_format_desc& format_desc, bool key_only) : frame_(frame) - , format_desc_(format_desc){} + , format_desc_(format_desc) + , key_only_(key_only){} - STDMETHOD (QueryInterface(REFIID, LPVOID*)) {return E_NOINTERFACE;} - STDMETHOD_(ULONG, AddRef()) {return 1;} - STDMETHOD_(ULONG, Release()) {return 1;} - - STDMETHOD_(long, GetWidth()) {return format_desc_.width;} - STDMETHOD_(long, GetHeight()) {return format_desc_.height;} - STDMETHOD_(long, GetRowBytes()) {return format_desc_.width*4;} - STDMETHOD_(BMDPixelFormat, GetPixelFormat()){return bmdFormat8BitBGRA;} - STDMETHOD_(BMDFrameFlags, GetFlags()) {return bmdFrameFlagDefault;} + STDMETHOD (QueryInterface(REFIID, LPVOID*)) {return E_NOINTERFACE;} + STDMETHOD_(ULONG, AddRef()) {return 1;} + STDMETHOD_(ULONG, Release()) {return 1;} + + STDMETHOD_(long, GetWidth()) {return format_desc_.width;} + STDMETHOD_(long, GetHeight()) {return format_desc_.height;} + STDMETHOD_(long, GetRowBytes()) {return format_desc_.width*4;} + STDMETHOD_(BMDPixelFormat, GetPixelFormat()) {return bmdFormat8BitBGRA;} + STDMETHOD_(BMDFrameFlags, GetFlags()) {return bmdFrameFlagDefault;} STDMETHOD(GetBytes(void** buffer)) { static std::vector zeros(1920*1080*4, 0); - *buffer = const_cast(frame_->image_data().begin()); if(static_cast(frame_->image_data().size()) != format_desc_.size) + { *buffer = zeros.data(); + return S_OK; + } + + if(!key_only_) + *buffer = const_cast(frame_->image_data().begin()); + else + { + if(key_data_.empty()) + { + key_data_.resize(frame_->image_data().size()); + fast_memshfl(key_data_.data(), frame_->image_data().begin(), frame_->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303); + } + *buffer = key_data_.data(); + } + return S_OK; } @@ -94,31 +116,32 @@ public: struct decklink_consumer : public IDeckLinkVideoOutputCallback, public IDeckLinkAudioOutputCallback, boost::noncopyable { - const configuration config_; + const configuration config_; CComPtr decklink_; CComQIPtr output_; CComQIPtr configuration_; CComQIPtr keyer_; - std::exception_ptr exception_; + tbb::spin_mutex exception_mutex_; + std::exception_ptr exception_; - tbb::atomic is_running_; + tbb::atomic is_running_; - const std::wstring model_name_; - const core::video_format_desc format_desc_; - const size_t buffer_size_; + const std::wstring model_name_; + const core::video_format_desc format_desc_; + const size_t buffer_size_; - unsigned long frames_scheduled_; - unsigned long audio_scheduled_; + long long frames_scheduled_; + long long audio_scheduled_; - size_t preroll_count_; + size_t preroll_count_; std::list> frame_container_; // Must be std::list in order to guarantee that pointers are always valid. - boost::circular_buffer> audio_container_; + boost::circular_buffer> audio_container_; - tbb::concurrent_bounded_queue> video_frame_buffer_; - tbb::concurrent_bounded_queue> audio_frame_buffer_; + tbb::concurrent_bounded_queue> video_frame_buffer_; + tbb::concurrent_bounded_queue> audio_frame_buffer_; std::shared_ptr graph_; boost::timer tick_timer_; @@ -145,10 +168,10 @@ public: graph_ = diagnostics::create_graph(narrow(print())); graph_->add_guide("tick-time", 0.5); - graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f)); + graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); graph_->set_color("late-frame", diagnostics::color(0.6f, 0.3f, 0.3f)); graph_->set_color("dropped-frame", diagnostics::color(0.3f, 0.6f, 0.3f)); - graph_->set_color("flushed-frame", diagnostics::color(0.3f, 0.3f, 0.6f)); + graph_->set_color("flushed-frame", diagnostics::color(0.4f, 0.3f, 0.8f)); enable_video(get_display_mode(output_, format_desc_.format, bmdFormat8BitBGRA, bmdVideoOutputFlagDefault)); @@ -156,7 +179,7 @@ public: enable_audio(); set_latency(config.low_latency); - set_keyer(config.external_key); + set_keyer(config.internal_key); if(config.embedded_audio) output_->BeginAudioPreroll(); @@ -166,8 +189,6 @@ public: if(!config.embedded_audio) start_playback(); - - CASPAR_LOG(info) << print() << L" Successfully Initialized."; } ~decklink_consumer() @@ -204,9 +225,9 @@ public: } } - void set_keyer(bool external_key) + void set_keyer(bool internal_key) { - if(!external_key) + if(internal_key) { if(FAILED(keyer_->Enable(FALSE))) CASPAR_LOG(error) << print() << L" Failed to enable internal keyer."; @@ -273,7 +294,11 @@ public: try { if(result == bmdOutputFrameDisplayedLate) + { graph_->add_tag("late-frame"); + ++frames_scheduled_; + ++audio_scheduled_; + } else if(result == bmdOutputFrameDropped) graph_->add_tag("dropped-frame"); else if(result == bmdOutputFrameFlushed) @@ -284,12 +309,13 @@ public: return frame.get() == completed_frame; })); - std::shared_ptr frame; + std::shared_ptr frame; video_frame_buffer_.pop(frame); - schedule_next_video(make_safe(frame)); + schedule_next_video(make_safe(frame)); } catch(...) { + tbb::spin_mutex::scoped_lock lock(exception_mutex_); exception_ = std::current_exception(); return E_FAIL; } @@ -316,13 +342,14 @@ public: } else { - std::shared_ptr frame; + std::shared_ptr frame; audio_frame_buffer_.pop(frame); schedule_next_audio(make_safe(frame)); } } catch(...) { + tbb::spin_mutex::scoped_lock lock(exception_mutex_); exception_ = std::current_exception(); return E_FAIL; } @@ -330,23 +357,19 @@ public: return S_OK; } - void schedule_next_audio(const safe_ptr& frame) + void schedule_next_audio(const safe_ptr& frame) { - static std::vector silence(48000, 0); - - const int sample_count = format_desc_.audio_samples_per_frame; - const int sample_frame_count = sample_count/2; + const int sample_frame_count = frame->audio_data().size()/format_desc_.audio_channels; - const int16_t* frame_audio_data = frame->audio_data().size() == sample_count ? frame->audio_data().begin() : silence.data(); - audio_container_.push_back(std::vector(frame_audio_data, frame_audio_data+sample_count)); + audio_container_.push_back(std::vector(frame->audio_data().begin(), frame->audio_data().end())); if(FAILED(output_->ScheduleAudioSamples(audio_container_.back().data(), sample_frame_count, (audio_scheduled_++) * sample_frame_count, format_desc_.audio_sample_rate, nullptr))) CASPAR_LOG(error) << print() << L" Failed to schedule audio."; } - void schedule_next_video(const safe_ptr& frame) + void schedule_next_video(const safe_ptr& frame) { - frame_container_.push_back(std::make_shared(frame, format_desc_)); + frame_container_.push_back(std::make_shared(frame, format_desc_, config_.key_only)); if(FAILED(output_->ScheduleVideoFrame(frame_container_.back().get(), (frames_scheduled_++) * format_desc_.duration, format_desc_.duration, format_desc_.time_scale))) CASPAR_LOG(error) << print() << L" Failed to schedule video."; @@ -354,10 +377,13 @@ public: tick_timer_.restart(); } - void send(const safe_ptr& frame) + void send(const safe_ptr& frame) { - if(exception_ != nullptr) - std::rethrow_exception(exception_); + { + tbb::spin_mutex::scoped_lock lock(exception_mutex_); + if(exception_ != nullptr) + std::rethrow_exception(exception_); + } if(!is_running_) BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Is not running.")); @@ -375,28 +401,60 @@ public: struct decklink_consumer_proxy : public core::frame_consumer { - const configuration config_; - - com_context context_; + const configuration config_; + com_context context_; + core::video_format_desc format_desc_; + size_t fail_count_; public: decklink_consumer_proxy(const configuration& config) : config_(config) - , context_(L"decklink_consumer[" + boost::lexical_cast(config.device_index) + L"]"){} + , context_(L"decklink_consumer[" + boost::lexical_cast(config.device_index) + L"]") + , fail_count_(0) + { + } + + ~decklink_consumer_proxy() + { + auto str = print(); + context_.reset(); + CASPAR_LOG(info) << str << L" Successfully Uninitialized."; + } virtual void initialize(const core::video_format_desc& format_desc) { - context_.reset([&]{return new decklink_consumer(config_, format_desc);}); + format_desc_ = format_desc; + context_.reset([&]{return new decklink_consumer(config_, format_desc_);}); + + CASPAR_LOG(info) << print() << L" Successfully Initialized."; } - virtual void send(const safe_ptr& frame) + virtual bool send(const safe_ptr& frame) { - context_->send(frame); + if(!context_) + context_.reset([&]{return new decklink_consumer(config_, format_desc_);}); + + try + { + context_->send(frame); + fail_count_ = 0; + } + catch(...) + { + context_.reset(); + + if(fail_count_++ > 3) + return false; // Outside didn't handle exception properly, just give up. + + throw; + } + + return true; } virtual std::wstring print() const { - return context_->print(); + return context_ ? context_->print() : L"decklink_consumer"; } virtual bool key_only() const @@ -406,12 +464,7 @@ public: virtual const core::video_format_desc& get_video_format_desc() const { - return context_->get_video_format_desc(); - } - - virtual size_t buffer_depth() const - { - return context_->buffer_size_; + return format_desc_; } }; @@ -425,7 +478,7 @@ safe_ptr create_decklink_consumer(const std::vector 1) config.device_index = lexical_cast_or_default(params[1], config.device_index); - config.external_key = std::find(params.begin(), params.end(), L"EXTERNAL_KEY") != params.end(); + config.internal_key = std::find(params.begin(), params.end(), L"INTERNAL_KEY") != params.end(); config.low_latency = std::find(params.begin(), params.end(), L"LOW_LATENCY") != params.end(); config.embedded_audio = std::find(params.begin(), params.end(), L"EMBEDDED_AUDIO") != params.end(); config.key_only = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end(); @@ -437,7 +490,7 @@ safe_ptr create_decklink_consumer(const boost::property_tr { configuration config; - config.external_key = ptree.get("external-key", config.external_key); + config.internal_key = ptree.get("internal-key", config.internal_key); config.low_latency = ptree.get("low-latency", config.low_latency); config.key_only = ptree.get("key-only", config.key_only); config.device_index = ptree.get("device", config.device_index);