X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fbluefish%2Fconsumer%2Fbluefish_consumer.cpp;h=d41f740572dd49527ceb0ee6d34a199806dec219;hb=f6405edad3c494c1ddd4e91773e908369f4802c3;hp=75ac170ccfb18237667b12115406ec3c2f7b2af9;hpb=3f72de1a07476a3eaaae27c98141e86e63a2bd39;p=casparcg diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp index 75ac170cc..d41f74057 100644 --- a/modules/bluefish/consumer/bluefish_consumer.cpp +++ b/modules/bluefish/consumer/bluefish_consumer.cpp @@ -56,6 +56,9 @@ #include namespace caspar { namespace bluefish { + +#define BLUEFISH_HW_BUFFER_DEPTH 1 +#define BLUEFISH_SOFTWARE_BUFFERS 4 enum class hardware_downstream_keyer_mode { @@ -117,34 +120,39 @@ bool get_videooutput_channel_routing_info_from_streamid(bluefish_hardware_output struct bluefish_consumer : boost::noncopyable { - spl::shared_ptr blue_; - const unsigned int device_index_; - const core::video_format_desc format_desc_; - const core::audio_channel_layout channel_layout_; - core::audio_channel_remapper channel_remapper_; - const int channel_index_; - - const std::wstring model_name_; - - spl::shared_ptr graph_; - boost::timer frame_timer_; - boost::timer tick_timer_; - boost::timer sync_timer_; + spl::shared_ptr blue_; + const unsigned int device_index_; + const core::video_format_desc format_desc_; + const core::audio_channel_layout channel_layout_; + core::audio_channel_remapper channel_remapper_; + const int channel_index_; + + const std::wstring model_name_; + + spl::shared_ptr graph_; + boost::timer frame_timer_; + boost::timer tick_timer_; + boost::timer sync_timer_; - unsigned int vid_fmt_; + unsigned int vid_fmt_; + + std::array all_frames_; + tbb::concurrent_bounded_queue reserved_frames_; + tbb::concurrent_bounded_queue live_frames_; + std::shared_ptr dma_present_thread_; + tbb::atomic end_dma_thread_; - std::array reserved_frames_; - tbb::concurrent_bounded_queue frame_buffer_; - tbb::atomic presentation_delay_millis_; - core::const_frame previous_frame_ = core::const_frame::empty(); + tbb::concurrent_bounded_queue frame_buffer_; + tbb::atomic presentation_delay_millis_; + core::const_frame previous_frame_ = core::const_frame::empty(); - const bool embedded_audio_; - const bool key_only_; + const bool embedded_audio_; + const bool key_only_; - executor executor_; - hardware_downstream_keyer_mode hardware_keyer_; - hardware_downstream_keyer_audio_source keyer_audio_source_; - bluefish_hardware_output_channel device_output_channel_; + executor executor_; + hardware_downstream_keyer_mode hardware_keyer_; + hardware_downstream_keyer_audio_source keyer_audio_source_; + bluefish_hardware_output_channel device_output_channel_; public: bluefish_consumer( const core::video_format_desc& format_desc, @@ -175,6 +183,9 @@ public: executor_.set_capacity(1); presentation_delay_millis_ = 0; + reserved_frames_.set_capacity(BLUEFISH_SOFTWARE_BUFFERS); + live_frames_.set_capacity(BLUEFISH_SOFTWARE_BUFFERS); + graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f)); graph_->set_color("sync-time", diagnostics::color(1.0f, 0.0f, 0.0f)); graph_->set_color("frame-time", diagnostics::color(0.5f, 1.0f, 0.2f)); @@ -232,7 +243,7 @@ public: CASPAR_LOG(info) << print() << TEXT(" Enabled embedded-audio."); } - if(BLUE_FAIL(blue_->set_card_property32(VIDEO_OUTPUT_ENGINE, VIDEO_ENGINE_FRAMESTORE))) + if(BLUE_FAIL(blue_->set_card_property32(VIDEO_OUTPUT_ENGINE, VIDEO_ENGINE_PLAYBACK))) CASPAR_LOG(warning) << print() << TEXT(" Failed to set video engine."); if (is_epoch_card((*blue_))) @@ -241,7 +252,10 @@ public: enable_video_output(); int n = 0; - boost::range::generate(reserved_frames_, [&]{return std::make_shared(static_cast(format_desc_.size), n++);}); + boost::range::generate(all_frames_, [&]{return std::make_shared(static_cast(format_desc_.size), n++);}); + + for (size_t i = 0; i < all_frames_.size(); i++) + reserved_frames_.push(all_frames_[i]); } ~bluefish_consumer() @@ -250,8 +264,12 @@ public: { executor_.invoke([&] { + end_dma_thread_ = true; disable_video_output(); - blue_->detach(); + blue_->detach(); + + if (dma_present_thread_) + dma_present_thread_->join(); }); } catch(...) @@ -270,6 +288,8 @@ public: { if (BLUE_FAIL(blue_->set_card_property32(DEFAULT_VIDEO_OUTPUT_CHANNEL, out_vid_channel))) CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(" Failed to set video stream.")); + + blue_->video_playback_stop(0, 0); } } } @@ -286,7 +306,7 @@ public: bool duallink_4224_enabled = false; if ((device_output_channel_ == bluefish_hardware_output_channel::channel_a || device_output_channel_ == bluefish_hardware_output_channel::channel_c) && - (hardware_keyer_ == hardware_downstream_keyer_mode::external)) + (hardware_keyer_ == hardware_downstream_keyer_mode::external) || (hardware_keyer_ == hardware_downstream_keyer_mode::internal) ) { duallink_4224_enabled = true; } @@ -381,6 +401,9 @@ public: if (BLUE_FAIL(blue_->get_card_property32(INVALID_VIDEO_MODE_FLAG, invalidVideoModeFlag))) CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(" Failed to get invalid video mode flag")); + // The bluefish HW keyer is NOT going to pre-multiply the RGB with the A. + keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_DATA_IS_PREMULTIPLIED(keyer_control_value); + keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_ENABLED(keyer_control_value); if (BLUE_FAIL(blue_->get_card_property32(VIDEO_INPUT_SIGNAL_VIDEO_MODE, inputVideoSignal))) CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(" Failed to get video input signal mode")); @@ -436,71 +459,132 @@ public: } return true; - }, caspar::task_priority::higher_priority); + }); + } + + void dma_present_thread_actual() + { + bvc_wrapper wait_b; + wait_b.attach(device_index_); + EBlueVideoChannel out_vid_channel = get_bluesdk_videochannel_from_streamid(device_output_channel_); + wait_b.set_card_property32(DEFAULT_VIDEO_OUTPUT_CHANNEL, out_vid_channel); + int frames_to_buffer = BLUEFISH_HW_BUFFER_DEPTH; + unsigned long buffer_id = 0; + unsigned long underrun = 0; + + while (!end_dma_thread_) + { + blue_dma_buffer_ptr buf = nullptr; + if (live_frames_.try_pop(buf) && BLUE_OK(blue_->video_playback_allocate(buffer_id, underrun))) + { + // Send and display + if (embedded_audio_) + { + // Do video first, then do hanc DMA... + blue_->system_buffer_write(const_cast(buf->image_data()), + static_cast(buf->image_size()), + BlueImage_HANC_DMABuffer(buffer_id, BLUE_DATA_IMAGE), + 0); + + blue_->system_buffer_write(buf->hanc_data(), + static_cast(buf->hanc_size()), + BlueImage_HANC_DMABuffer(buffer_id, BLUE_DATA_HANC), + 0); + + if (BLUE_FAIL(blue_->video_playback_present(BlueBuffer_Image_HANC(buffer_id), 1, 0, 0))) + { + CASPAR_LOG(warning) << print() << TEXT(" video_playback_present failed."); + } + } + else + { + blue_->system_buffer_write(const_cast(buf->image_data()), + static_cast(buf->image_size()), + BlueImage_DMABuffer(buffer_id, BLUE_DATA_IMAGE), + 0); + + if (BLUE_FAIL(blue_->video_playback_present(BlueBuffer_Image(buffer_id), 1, 0, 0))) + CASPAR_LOG(warning) << print() << TEXT(" video_playback_present failed."); + } + + reserved_frames_.push(buf); + } + else + { + // do WFS + unsigned long n_field = 0; + wait_b.wait_video_output_sync(UPD_FMT_FRAME, n_field); + } + + if (frames_to_buffer > 0) + { + frames_to_buffer--; + if (frames_to_buffer == 0) + { + if (BLUE_FAIL(blue_->video_playback_start(0, 0))) + CASPAR_LOG(warning) << print() << TEXT("Error video playback start failed"); + } + } + } + wait_b.detach(); } void display_frame(core::const_frame frame) { - // Sync - sync_timer_.restart(); - unsigned long n_field = 0; - blue_->wait_video_output_sync(UPD_FMT_FRAME, n_field); - graph_->set_value("sync-time", sync_timer_.elapsed()*format_desc_.fps*0.5); - frame_timer_.restart(); if (previous_frame_ != core::const_frame::empty()) presentation_delay_millis_ = previous_frame_.get_age_millis(); previous_frame_ = frame; + blue_dma_buffer_ptr buf = nullptr; // Copy to local buffers - if(!frame.image_data().empty()) + if (reserved_frames_.try_pop(buf)) { - if(key_only_) - aligned_memshfl(reserved_frames_.front()->image_data(), frame.image_data().begin(), frame.image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303); + void* dest = buf->image_data(); + if (!frame.image_data().empty()) + { + if (key_only_) + aligned_memshfl(dest, frame.image_data().begin(), frame.image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303); + else + A_memcpy(dest, frame.image_data().begin(), frame.image_data().size()); + } else - A_memcpy(reserved_frames_.front()->image_data(), frame.image_data().begin(), frame.image_data().size()); - } - else - A_memset(reserved_frames_.front()->image_data(), 0, reserved_frames_.front()->image_size()); - - // Send and display - if(embedded_audio_) - { - auto remapped_audio = channel_remapper_.mix_and_rearrange(frame.audio_data()); - auto frame_audio = core::audio_32_to_24(remapped_audio); - encode_hanc(reinterpret_cast(reserved_frames_.front()->hanc_data()), - frame_audio.data(), - static_cast(frame.audio_data().size()/channel_layout_.num_channels), - static_cast(channel_layout_.num_channels)); - - blue_->system_buffer_write(const_cast(reserved_frames_.front()->image_data()), - static_cast(reserved_frames_.front()->image_size()), - BlueImage_HANC_DMABuffer(reserved_frames_.front()->id(), BLUE_DATA_IMAGE), - 0); - - blue_->system_buffer_write(reserved_frames_.front()->hanc_data(), - static_cast(reserved_frames_.front()->hanc_size()), - BlueImage_HANC_DMABuffer(reserved_frames_.front()->id(), BLUE_DATA_HANC), - 0); - - if(BLUE_FAIL(blue_->render_buffer_update(BlueBuffer_Image_HANC(reserved_frames_.front()->id())))) - CASPAR_LOG(warning) << print() << TEXT(" render_buffer_update failed."); - } - else - { - blue_->system_buffer_write(const_cast(reserved_frames_.front()->image_data()), - static_cast(reserved_frames_.front()->image_size()), - BlueImage_DMABuffer(reserved_frames_.front()->id(), BLUE_DATA_IMAGE), - 0); - - if(BLUE_FAIL(blue_->render_buffer_update(BlueBuffer_Image(reserved_frames_.front()->id())))) - CASPAR_LOG(warning) << print() << TEXT(" render_buffer_update failed."); - } + A_memset(dest, 0, buf->image_size()); + + frame_timer_.restart(); + + // remap, encode and copy hanc data + if (embedded_audio_) + { + auto remapped_audio = channel_remapper_.mix_and_rearrange(frame.audio_data()); + auto frame_audio = core::audio_32_to_24(remapped_audio); + encode_hanc(reinterpret_cast(buf->hanc_data()), + frame_audio.data(), + static_cast(frame.audio_data().size() / channel_layout_.num_channels), + static_cast(channel_layout_.num_channels)); + } + live_frames_.push(buf); - boost::range::rotate(reserved_frames_, std::begin(reserved_frames_)+1); + // start the thread if required. + if (dma_present_thread_ == 0) + { + end_dma_thread_ = false; + dma_present_thread_ = std::make_shared([this] {dma_present_thread_actual(); }); +#if defined(_WIN32) + HANDLE handle = (HANDLE)dma_present_thread_->native_handle(); + SetThreadPriority(handle, THREAD_PRIORITY_HIGHEST); +#endif + } + } graph_->set_value("frame-time", static_cast(frame_timer_.elapsed()*format_desc_.fps*0.5)); + + // Sync + sync_timer_.restart(); + unsigned long n_field = 0; + blue_->wait_video_output_sync(UPD_FMT_FRAME, n_field); + graph_->set_value("sync-time", sync_timer_.elapsed()*format_desc_.fps*0.5); } void encode_hanc(BLUE_UINT32* hanc_data, void* audio_data, int audio_samples, int audio_nchannels) @@ -635,7 +719,7 @@ public: int buffer_depth() const override { - return 1; + return BLUEFISH_HW_BUFFER_DEPTH; } int index() const override