X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdecklink%2Fconsumer%2Fdecklink_consumer.cpp;h=03131d31031bba151af2b1aa9199bc420945a9be;hb=6016fd682b267d2886babd51b1faa9cdd1812d54;hp=b3a9400e9a18d594f30fc0a088a331f731552f64;hpb=0b0991ee9118226b405a2529ebb4456691d18cb8;p=casparcg diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp index b3a9400e9..03131d310 100644 --- a/modules/decklink/consumer/decklink_consumer.cpp +++ b/modules/decklink/consumer/decklink_consumer.cpp @@ -38,6 +38,7 @@ #include #include +#include #include #include @@ -48,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; @@ -56,7 +57,7 @@ struct configuration configuration() : device_index(1) , embedded_audio(false) - , external_key(false) + , internal_key(false) , low_latency(false) , key_only(false) , buffer_depth(core::consumer_buffer_depth()){} @@ -64,29 +65,62 @@ struct configuration class decklink_frame : public IDeckLinkVideoFrame { - const safe_ptr frame_; - const core::video_format_desc format_desc_; + tbb::atomic ref_count_; + std::shared_ptr frame_; + const core::video_format_desc format_desc_; + + bool key_only_; + std::vector> key_data_; public: - decklink_frame(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) + { + ref_count_ = 0; + } - STDMETHOD (QueryInterface(REFIID, LPVOID*)) {return E_NOINTERFACE;} - STDMETHOD_(ULONG, AddRef()) {return 1;} - STDMETHOD_(ULONG, Release()) {return 1;} + STDMETHOD (QueryInterface(REFIID, LPVOID*)) {return E_NOINTERFACE;} + STDMETHOD_(ULONG, AddRef()) + { + return ++ref_count_; + } + STDMETHOD_(ULONG, Release()) + { + --ref_count_; + if(ref_count_ == 0) + delete this; + return ref_count_; + } - 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_(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()); + static std::vector> zeros(1920*1080*4, 0); 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); + frame_.reset(); + } + *buffer = key_data_.data(); + } + return S_OK; } @@ -96,7 +130,7 @@ public: struct decklink_consumer : public IDeckLinkVideoOutputCallback, public IDeckLinkAudioOutputCallback, boost::noncopyable { - const configuration config_; + const configuration config_; CComPtr decklink_; CComQIPtr output_; @@ -117,8 +151,7 @@ struct decklink_consumer : public IDeckLinkVideoOutputCallback, public IDeckLink 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_; @@ -159,7 +192,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(); @@ -169,8 +202,6 @@ public: if(!config.embedded_audio) start_playback(); - - CASPAR_LOG(info) << print() << L" Successfully Initialized."; } ~decklink_consumer() @@ -207,9 +238,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."; @@ -231,7 +262,7 @@ public: void enable_audio() { - if(FAILED(output_->EnableAudioOutput(bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger, 2, bmdAudioOutputStreamTimestamped))) + if(FAILED(output_->EnableAudioOutput(bmdAudioSampleRate48kHz, bmdAudioSampleType32bitInteger, 2, bmdAudioOutputStreamTimestamped))) BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Could not enable audio output.")); if(FAILED(output_->SetAudioCallback(this))) @@ -286,14 +317,9 @@ public: else if(result == bmdOutputFrameFlushed) graph_->add_tag("flushed-frame"); - frame_container_.erase(std::find_if(frame_container_.begin(), frame_container_.end(), [&](const std::shared_ptr& frame) - { - return frame.get() == completed_frame; - })); - std::shared_ptr frame; video_frame_buffer_.pop(frame); - schedule_next_video(make_safe(frame)); + schedule_next_video(make_safe(frame)); } catch(...) { @@ -343,7 +369,7 @@ public: { const int sample_frame_count = frame->audio_data().size()/format_desc_.audio_channels; - audio_container_.push_back(std::vector(frame->audio_data().begin(), frame->audio_data().end())); + 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."; @@ -351,8 +377,8 @@ public: void schedule_next_video(const safe_ptr& frame) { - frame_container_.push_back(std::make_shared(frame, format_desc_)); - if(FAILED(output_->ScheduleVideoFrame(frame_container_.back().get(), (frames_scheduled_++) * format_desc_.duration, format_desc_.duration, format_desc_.time_scale))) + CComPtr frame2(new decklink_frame(frame, format_desc_, config_.key_only)); + if(FAILED(output_->ScheduleVideoFrame(frame2, (frames_scheduled_++) * format_desc_.duration, format_desc_.duration, format_desc_.time_scale))) CASPAR_LOG(error) << print() << L" Failed to schedule video."; graph_->update_value("tick-time", tick_timer_.elapsed()*format_desc_.fps*0.5); @@ -383,18 +409,30 @@ 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_; 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"]") + { + } + + ~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 bool send(const safe_ptr& frame) @@ -405,17 +443,12 @@ public: virtual std::wstring print() const { - return context_->print(); + return context_ ? context_->print() : L"decklink_consumer"; } - - virtual bool key_only() const - { - return config_.key_only; - } - + virtual const core::video_format_desc& get_video_format_desc() const { - return context_->get_video_format_desc(); + return format_desc_; } }; @@ -429,7 +462,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(); @@ -441,7 +474,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);