]> git.sesse.net Git - casparcg/blobdiff - modules/bluefish/consumer/bluefish_consumer.cpp
[bluefish_consumer] Install GPF handler for custom thread.
[casparcg] / modules / bluefish / consumer / bluefish_consumer.cpp
index 74096f2789ead94e2aaee7ab95f09853f7d0018d..9d757214a1544460980356abe2a6c98810f17539 100644 (file)
@@ -18,7 +18,7 @@
 *
 * Author: Robert Nagy, ronag89@gmail.com
 */
+
 #include "../StdAfx.h"
 
 #include "bluefish_consumer.h"
 #include <memory>
 #include <array>
 
-namespace caspar { namespace bluefish { 
-               
+namespace caspar { namespace bluefish {
+
+#define BLUEFISH_HW_BUFFER_DEPTH 1
+#define BLUEFISH_SOFTWARE_BUFFERS 4
+
 enum class hardware_downstream_keyer_mode
 {
        disable = 0,
-       enable = 1,
+       external = 1,
+       internal = 2,           // Bluefish dedicated HW keyer - only available on some models.
 };
 
 enum class hardware_downstream_keyer_audio_source
@@ -71,14 +75,11 @@ enum class hardware_downstream_keyer_audio_source
 
 enum class bluefish_hardware_output_channel
 {
-       // ** current Bluefish hardware only support 4224  on channels A and C.
-       hardware_4224_channel_a,
-       hardware_4224_channel_c,
-       hardware_422_channel_a,
-       hardware_422_channel_b,
-       hardware_422_channel_c,
-       hardware_422_channel_d,
-       default_output_channel = hardware_422_channel_a
+       channel_a,
+       channel_b,
+       channel_c,
+       channel_d,
+       default_output_channel = channel_a
 };
 
 EBlueVideoChannel get_bluesdk_videochannel_from_streamid(bluefish_hardware_output_channel streamid)
@@ -86,12 +87,10 @@ EBlueVideoChannel get_bluesdk_videochannel_from_streamid(bluefish_hardware_outpu
        /*This function would return the corresponding EBlueVideoChannel from the device output channel*/
        switch (streamid)
        {
-               case bluefish_hardware_output_channel::hardware_422_channel_a:  return BLUE_VIDEO_OUTPUT_CHANNEL_A;
-               case bluefish_hardware_output_channel::hardware_4224_channel_a: return BLUE_VIDEO_OUTPUT_CHANNEL_A;
-               case bluefish_hardware_output_channel::hardware_422_channel_b:  return BLUE_VIDEO_OUTPUT_CHANNEL_B;
-               case bluefish_hardware_output_channel::hardware_4224_channel_c: return BLUE_VIDEO_OUTPUT_CHANNEL_C;
-               case bluefish_hardware_output_channel::hardware_422_channel_c:  return BLUE_VIDEO_OUTPUT_CHANNEL_C;
-               case bluefish_hardware_output_channel::hardware_422_channel_d:  return BLUE_VIDEO_OUTPUT_CHANNEL_D;
+               case bluefish_hardware_output_channel::channel_a:       return BLUE_VIDEO_OUTPUT_CHANNEL_A;
+               case bluefish_hardware_output_channel::channel_b:       return BLUE_VIDEO_OUTPUT_CHANNEL_B;
+               case bluefish_hardware_output_channel::channel_c:       return BLUE_VIDEO_OUTPUT_CHANNEL_C;
+               case bluefish_hardware_output_channel::channel_d:       return BLUE_VIDEO_OUTPUT_CHANNEL_D;
                default: return BLUE_VIDEO_OUTPUT_CHANNEL_A;
        }
 }
@@ -102,22 +101,16 @@ bool get_videooutput_channel_routing_info_from_streamid(bluefish_hardware_output
 {
        switch (streamid)
        {
-       case bluefish_hardware_output_channel::hardware_4224_channel_a: channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHA;
-               sdioutputDstElement = EPOCH_DEST_SDI_OUTPUT_A;
-               break;
-       case bluefish_hardware_output_channel::hardware_4224_channel_c: channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHC;
-               sdioutputDstElement = EPOCH_DEST_SDI_OUTPUT_C;
-               break;
-       case bluefish_hardware_output_channel::hardware_422_channel_a:  channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHA;
+       case bluefish_hardware_output_channel::channel_a:       channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHA;
                sdioutputDstElement = EPOCH_DEST_SDI_OUTPUT_A;
                break;
-       case bluefish_hardware_output_channel::hardware_422_channel_b:  channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHB;
+       case bluefish_hardware_output_channel::channel_b:       channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHB;
                sdioutputDstElement = EPOCH_DEST_SDI_OUTPUT_B;
                break;
-       case bluefish_hardware_output_channel::hardware_422_channel_c:  channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHC;
+       case bluefish_hardware_output_channel::channel_c:       channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHC;
                sdioutputDstElement = EPOCH_DEST_SDI_OUTPUT_C;
                break;
-       case bluefish_hardware_output_channel::hardware_422_channel_d:  channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHD;
+       case bluefish_hardware_output_channel::channel_d:       channelSrcElement = EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHD;
                sdioutputDstElement = EPOCH_DEST_SDI_OUTPUT_D;
                break;
        default: return false;
@@ -127,34 +120,39 @@ bool get_videooutput_channel_routing_info_from_streamid(bluefish_hardware_output
 
 struct bluefish_consumer : boost::noncopyable
 {
-       spl::shared_ptr<bvc_wrapper>                                                    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<diagnostics::graph>                                     graph_;
-       boost::timer                                                                            frame_timer_;
-       boost::timer                                                                            tick_timer_;
-       boost::timer                                                                            sync_timer_;    
-                       
-       unsigned int                                                                            vid_fmt_;
-
-       std::array<blue_dma_buffer_ptr, 4>                                      reserved_frames_;       
-       tbb::concurrent_bounded_queue<core::const_frame>        frame_buffer_;
-       tbb::atomic<int64_t>                                                            presentation_delay_millis_;
-       core::const_frame                                                                       previous_frame_                         = core::const_frame::empty();
-
-       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_;
+       spl::shared_ptr<bvc_wrapper>                                                            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<diagnostics::graph>                                                     graph_;
+       boost::timer                                                                                            frame_timer_;
+       boost::timer                                                                                            tick_timer_;
+       boost::timer                                                                                            sync_timer_;
+
+       unsigned int                                                                                            vid_fmt_;
+
+       std::array<blue_dma_buffer_ptr, BLUEFISH_SOFTWARE_BUFFERS>      all_frames_;
+       tbb::concurrent_bounded_queue<blue_dma_buffer_ptr>                      reserved_frames_;
+       tbb::concurrent_bounded_queue<blue_dma_buffer_ptr>                      live_frames_;
+       std::shared_ptr<std::thread>                                                            dma_present_thread_;
+       tbb::atomic<bool>                                                                                       end_dma_thread_;
+
+       tbb::concurrent_bounded_queue<core::const_frame>                        frame_buffer_;
+       tbb::atomic<int64_t>                                                                            presentation_delay_millis_;
+       core::const_frame                                                                                       previous_frame_                         = core::const_frame::empty();
+
+       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_;
 public:
        bluefish_consumer(
                        const core::video_format_desc& format_desc,
@@ -185,7 +183,10 @@ public:
                executor_.set_capacity(1);
                presentation_delay_millis_ = 0;
 
-               graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   
+               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));
                graph_->set_text(print());
@@ -201,26 +202,26 @@ public:
                // Select Update Mode for output
                if(BLUE_FAIL(blue_->set_card_property32(VIDEO_UPDATE_TYPE, UPD_FMT_FRAME)))
                        CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to set update type."));
-       
+
                disable_video_output();
                setup_hardware_output_channel_routing();
-                       
+
                //Select output memory format
                if(BLUE_FAIL(blue_->set_card_property32(VIDEO_MEMORY_FORMAT, MEM_FMT_ARGB_PC)))
                        CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(print() + L" Failed to set memory format."));
-               
+
                //Select image orientation
                if(BLUE_FAIL(blue_->set_card_property32(VIDEO_IMAGE_ORIENTATION, ImageOrientation_Normal)))
-                       CASPAR_LOG(warning) << print() << L" Failed to set image orientation to normal.";       
+                       CASPAR_LOG(warning) << print() << L" Failed to set image orientation to normal.";
 
                // Select data range
                if(BLUE_FAIL(blue_->set_card_property32(VIDEO_RGB_DATA_RANGE, CGR_RANGE)))
-                       CASPAR_LOG(warning) << print() << L" Failed to set RGB data range to CGR.";     
-               
-               if(!embedded_audio_ || (hardware_keyer_ == hardware_downstream_keyer_mode::enable && keyer_audio_source_ == hardware_downstream_keyer_audio_source::VideoOutputChannel) )
+                       CASPAR_LOG(warning) << print() << L" Failed to set RGB data range to CGR.";
+
+               if(!embedded_audio_ || (hardware_keyer_ == hardware_downstream_keyer_mode::internal && keyer_audio_source_ == hardware_downstream_keyer_audio_source::SDIVideoInput) )
                {
                        if(BLUE_FAIL(blue_->set_card_property32(EMBEDEDDED_AUDIO_OUTPUT, 0)))
-                               CASPAR_LOG(warning) << TEXT("BLUECARD ERROR: Failed to disable embedded audio.");                       
+                               CASPAR_LOG(warning) << TEXT("BLUECARD ERROR: Failed to disable embedded audio.");
                        CASPAR_LOG(info) << print() << TEXT(" Disabled embedded-audio.");
                }
                else
@@ -238,20 +239,23 @@ public:
                                audio_value |= blue_emb_audio_group4_enable;
 
                        if(BLUE_FAIL(blue_->set_card_property32(EMBEDEDDED_AUDIO_OUTPUT, audio_value)))
-                               CASPAR_LOG(warning) << print() << TEXT(" Failed to enable embedded audio.");                    
+                               CASPAR_LOG(warning) << print() << TEXT(" Failed to enable embedded audio.");
                        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_)))
                        setup_hardware_downstream_keyer(hardware_keyer_, keyer_audio_source_);
 
                enable_video_output();
-                                               
+
                int n = 0;
-               boost::range::generate(reserved_frames_, [&]{return std::make_shared<blue_dma_buffer>(static_cast<int>(format_desc_.size), n++);});
+               boost::range::generate(all_frames_, [&]{return std::make_shared<blue_dma_buffer>(static_cast<int>(format_desc_.size), n++);});
+
+               for (size_t i = 0; i < all_frames_.size(); i++)
+                       reserved_frames_.push(all_frames_[i]);
        }
 
        ~bluefish_consumer()
@@ -260,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(...)
@@ -280,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);
                        }
                }
        }
@@ -295,8 +305,11 @@ public:
                        get_videooutput_channel_routing_info_from_streamid(device_output_channel_, src_element, dst_element);
                        bool duallink_4224_enabled = false;
 
-                       if (device_output_channel_ == bluefish_hardware_output_channel::hardware_4224_channel_a || device_output_channel_ == bluefish_hardware_output_channel::hardware_4224_channel_c)
+                       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::internal) )
+                       {
                                duallink_4224_enabled = true;
+                       }
 
                        // Enable/Disable dual link output
                        if (BLUE_FAIL(blue_->set_card_property32(VIDEO_DUAL_LINK_OUTPUT, duallink_4224_enabled)))
@@ -312,7 +325,7 @@ public:
                                        CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(" Failed to MR 2 routing."));
 
                                // If single link 422, but on second channel AND on Neutron we need to set Genlock to Aux.
-                               if (is_epoch_neutron_1i2o_card((*blue_)))               
+                               if (is_epoch_neutron_1i2o_card((*blue_)))
                                {
                                        if (blueVideoOutputChannel == BLUE_VIDEO_OUTPUT_CHANNEL_B)
                                        {
@@ -376,18 +389,21 @@ public:
                if (nInputSDIConnector == 0 || nInputStreams == 0)
                        return;
 
-               if (keyer == hardware_downstream_keyer_mode::disable)
+               if (keyer == hardware_downstream_keyer_mode::disable || keyer == hardware_downstream_keyer_mode::external)
                {
                        keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_DISABLED(keyer_control_value);
                        keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_DISABLE_OVER_BLACK(keyer_control_value);
                }
-               else if (keyer == hardware_downstream_keyer_mode::enable)
+               else if (keyer == hardware_downstream_keyer_mode::internal)
                {
                        unsigned int invalidVideoModeFlag = 0;
                        unsigned int inputVideoSignal = 0;
                        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"));
@@ -396,13 +412,13 @@ public:
                                keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_ENABLE_OVER_BLACK(keyer_control_value);
                        else
                                keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_DISABLE_OVER_BLACK(keyer_control_value);
-               
+
                        // lock to input
                        if (BLUE_FAIL(blue_->set_card_property32(VIDEO_GENLOCK_SIGNAL, BlueSDI_A_BNC)))
                                CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info(" Failed to set the genlock to the input for the HW keyer"));
                }
 
-               if (audio_source == hardware_downstream_keyer_audio_source::SDIVideoInput && (keyer == hardware_downstream_keyer_mode::enable))
+               if (audio_source == hardware_downstream_keyer_audio_source::SDIVideoInput && (keyer == hardware_downstream_keyer_mode::internal))
                        keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_USE_INPUT_ANCILLARY(keyer_control_value);
                else if (audio_source == hardware_downstream_keyer_audio_source::VideoOutputChannel)
                        keyer_control_value = VIDEO_ONBOARD_KEYER_SET_STATUS_USE_OUTPUT_ANCILLARY(keyer_control_value);
@@ -414,23 +430,30 @@ public:
        void enable_video_output()
        {
                if(BLUE_FAIL(blue_->set_card_property32(VIDEO_BLACKGENERATOR, 0)))
-                       CASPAR_LOG(error) << print() << TEXT(" Failed to disable video output.");       
+                       CASPAR_LOG(error) << print() << TEXT(" Failed to disable video output.");
        }
 
        void disable_video_output()
        {
                blue_->video_playback_stop(0,0);
+               blue_->set_card_property32(VIDEO_DUAL_LINK_OUTPUT, 0);
+               ULONG routingValue = EPOCH_SET_ROUTING(EPOCH_SRC_OUTPUT_MEM_INTERFACE_CHA, EPOCH_DEST_SDI_OUTPUT_B, BLUE_CONNECTOR_PROP_SINGLE_LINK);
+               blue_->set_card_property32(MR2_ROUTING, routingValue);
+
                if(BLUE_FAIL(blue_->set_card_property32(VIDEO_BLACKGENERATOR, 1)))
-                       CASPAR_LOG(error)<< print() << TEXT(" Failed to disable video output.");                
+                       CASPAR_LOG(error)<< print() << TEXT(" Failed to disable video output.");
+               if (BLUE_FAIL(blue_->set_card_property32(EMBEDEDDED_AUDIO_OUTPUT, 0)))
+                       CASPAR_LOG(error) << print() << TEXT(" Failed to disable audio output.");
+
        }
-       
+
        std::future<bool> send(core::const_frame& frame)
-       {                                       
+       {
                return executor_.begin_invoke([=]() -> bool
                {
                        try
-                       {       
-                               display_frame(frame);                           
+                       {
+                               display_frame(frame);
                                graph_->set_value("tick-time", static_cast<float>(tick_timer_.elapsed()*format_desc_.fps*0.5));
                                tick_timer_.restart();
                        }
@@ -443,77 +466,135 @@ public:
                });
        }
 
-       void display_frame(core::const_frame frame)
+       void dma_present_thread_actual()
        {
-               // Sync
+               ensure_gpf_handler_installed_for_thread("bluefish consumer DMA thread");
 
-               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();         
+               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<uint8_t*>(buf->image_data()),
+                                               static_cast<unsigned long>(buf->image_size()),
+                                               BlueImage_HANC_DMABuffer(buffer_id, BLUE_DATA_IMAGE),
+                                               0);
+
+                                       blue_->system_buffer_write(buf->hanc_data(),
+                                               static_cast<unsigned long>(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<uint8_t*>(buf->image_data()),
+                                               static_cast<unsigned long>(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)
+       {
+               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());
-                                                               
+                               A_memset(dest, 0, buf->image_size());
 
-               // Send and display
+                       frame_timer_.restart();
 
-               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<BLUE_UINT32*>(reserved_frames_.front()->hanc_data()), 
-                                               frame_audio.data(), 
-                                               static_cast<int>(frame.audio_data().size()/channel_layout_.num_channels), 
-                                               static_cast<int>(channel_layout_.num_channels));
-                                                               
-                       blue_->system_buffer_write(const_cast<uint8_t*>(reserved_frames_.front()->image_data()), 
-                                                                                       static_cast<unsigned long>(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<unsigned long>(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<uint8_t*>(reserved_frames_.front()->image_data()),
-                                                                                       static_cast<unsigned long>(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.");
-               }
+                       // 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<BLUE_UINT32*>(buf->hanc_data()),
+                                       frame_audio.data(),
+                                       static_cast<int>(frame.audio_data().size() / channel_layout_.num_channels),
+                                       static_cast<int>(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<std::thread>([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<float>(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)
-       {       
+       {
                const auto sample_type = AUDIO_CHANNEL_24BIT | AUDIO_CHANNEL_LITTLEENDIAN;
                auto emb_audio_flag = blue_emb_audio_enable | blue_emb_audio_group1_enable;
 
@@ -525,25 +606,25 @@ public:
 
                if (audio_nchannels > 12)
                        emb_audio_flag |= blue_emb_audio_group4_enable;
-               
+
                hanc_stream_info_struct hanc_stream_info;
                memset(&hanc_stream_info, 0, sizeof(hanc_stream_info));
-               
+
                hanc_stream_info.AudioDBNArray[0] = -1;
                hanc_stream_info.AudioDBNArray[1] = -1;
                hanc_stream_info.AudioDBNArray[2] = -1;
                hanc_stream_info.AudioDBNArray[3] = -1;
                hanc_stream_info.hanc_data_ptr    = hanc_data;
-               hanc_stream_info.video_mode               = vid_fmt_;           
-               
+               hanc_stream_info.video_mode               = vid_fmt_;
+
                int cardType = CRD_INVALID;
                blue_->query_card_type(cardType, device_index_);
                blue_->encode_hanc_frame(cardType, &hanc_stream_info, audio_data, audio_nchannels, audio_samples, sample_type, emb_audio_flag);
        }
-       
+
        std::wstring print() const
        {
-               return model_name_ + L" [" + boost::lexical_cast<std::wstring>(channel_index_) + L"-" + 
+               return model_name_ + L" [" + boost::lexical_cast<std::wstring>(channel_index_) + L"-" +
                        boost::lexical_cast<std::wstring>(device_index_) + L"|" +  format_desc_.name + L"]";
        }
 
@@ -572,9 +653,9 @@ struct bluefish_consumer_proxy : public core::frame_consumer
 
 public:
 
-       bluefish_consumer_proxy(int device_index, 
-                                                       bool embedded_audio, 
-                                                       bool key_only, 
+       bluefish_consumer_proxy(int device_index,
+                                                       bool embedded_audio,
+                                                       bool key_only,
                                                        hardware_downstream_keyer_mode keyer,
                                                        hardware_downstream_keyer_audio_source keyer_audio_source,
                                                        const core::audio_channel_layout& out_channel_layout,
@@ -589,9 +670,9 @@ public:
                , hardware_output_channel_(hardware_output_channel)
        {
        }
-       
+
        // frame_consumer
-       
+
        void initialize(const core::video_format_desc& format_desc, const core::audio_channel_layout& channel_layout, int channel_index) override
        {
                format_desc_            = format_desc;
@@ -602,25 +683,25 @@ public:
                        out_channel_layout_ = in_channel_layout_;
 
                consumer_.reset();
-               consumer_.reset(new bluefish_consumer(  format_desc, 
-                                                                                               in_channel_layout_, 
-                                                                                               out_channel_layout_, 
-                                                                                               device_index_, 
-                                                                                               embedded_audio_, 
-                                                                                               key_only_, 
+               consumer_.reset(new bluefish_consumer(  format_desc,
+                                                                                               in_channel_layout_,
+                                                                                               out_channel_layout_,
+                                                                                               device_index_,
+                                                                                               embedded_audio_,
+                                                                                               key_only_,
                                                                                                hardware_keyer_,
-                                                                                               hardware_keyer_audio_source_, 
+                                                                                               hardware_keyer_audio_source_,
                                                                                                channel_index,
                                                                                                hardware_output_channel_));
        }
-       
+
        std::future<bool> send(core::const_frame frame) override
        {
                CASPAR_VERIFY(audio_cadence_.front() * in_channel_layout_.num_channels == static_cast<size_t>(frame.audio_data().size()));
                boost::range::rotate(audio_cadence_, std::begin(audio_cadence_)+1);
                return consumer_->send(frame);
        }
-               
+
        std::wstring print() const override
        {
                return consumer_ ? consumer_->print() : L"[bluefish_consumer]";
@@ -644,9 +725,9 @@ public:
 
        int buffer_depth() const override
        {
-               return 1;
+               return BLUEFISH_HW_BUFFER_DEPTH;
        }
-       
+
        int index() const override
        {
                return 400 + device_index_;
@@ -661,43 +742,36 @@ public:
        {
                return monitor_subject_;
        }
-};     
+};
 
 
 void describe_consumer(core::help_sink& sink, const core::help_repository& repo)
 {
        sink.short_description(L"Sends video on an SDI output using Bluefish video cards.");
-       sink.syntax(L"BLUEFISH {[device_index:int]|1} {[embedded_audio:EMBEDDED_AUDIO]} {[key_only:KEY_ONLY]} {CHANNEL_LAYOUT [channel_layout:string]}");
+       sink.syntax(L"BLUEFISH {[device_index:int]|1} {[sdi_device:int]|a} {[embedded_audio:EMBEDDED_AUDIO]} {[key_only:KEY_ONLY]} {CHANNEL_LAYOUT [channel_layout:string]} {[keyer:string|disabled]} ");
        sink.para()
-               ->text(L"Sends video on an SDI output using Bluefish video cards. Multiple video cards can be ")
+               ->text(L"Sends video on an SDI output using Bluefish video cards. Multiple devices can be ")
                ->text(L"installed in the same machine and used at the same time, they will be addressed via ")
                ->text(L"different ")->code(L"device_index")->text(L" parameters.");
+       sink.para()->text(L"Multiple output channels can be accessed via the ")->code(L"sdi_device")->text(L" parameter.");
        sink.para()->text(L"Specify ")->code(L"embedded_audio")->text(L" to embed audio into the SDI signal.");
        sink.para()
                ->text(L"Specifying ")->code(L"key_only")->text(L" will extract only the alpha channel from the ")
                ->text(L"channel. This is useful when you have two SDI video cards, and neither has native support ")
                ->text(L"for separate fill/key output");
        sink.para()->text(L"Specify ")->code(L"channel_layout")->text(L" to output a different audio channel layout than the channel uses.");
-       sink.para()->text(L"Specify ")->code(L"BF_4224_CHANNELA")->text(L" to use channel A on the card to  be configured to output "
-               L"4:2:2:4 with fill and key HD-SDI output's A and B on the card.\n"
-               L"This is the default option\n");
-       sink.para()->text(L"Specify ")->code(L"BF_4224_CHANNELC")->text(L" to use channel C on the card to  be configured to output "
-               L" 4:2:2:4 with fill and key  HD-SDI output's C and D on the card\n"
-               L" Channel C 4:2:2:4 support is only available on 4 output variant of Supernova  and SupernovaS+ card\n");
-
-       sink.para()->text(L"Specify ")->code(L"ENABLE_KEYER")->text(L" to enable use of hardware keyer on the bluefish board.\n"
-               L"\t\t\tUsing this option hardware keyer would key using \n "
-               L"\t\t\tthe video input on the SDI as background layer \n"
-               L"\t\t\tand graphics Generated by CasparCG as foreground layer");
-       sink.para()->text(L"Specify ")->code(L"DISABLE_KEYER")->text(L" this option to disable hardware keyer on the bluefish board");
-       sink.para()->text(L"Specify ")->code(L"KEYER_AUDIO_SOURCE_SDIINPUT")->text(L" to enable SDI embedded audio to be transparently passed through the keyer to the SDI output\n");
-       sink.para()->text(L"Specify ")->code(L"KEYER_AUDIO_SOURCE_OUTPUT_CHANNEL")->text(L" to enable keyer to pass the audio provided by CasparCG to the SDI output\n");
+       sink.para()->text(L"Specify ")->code(L"keyer")->text(L" to control the output channel configuration and hardware keyer")
+               ->text(L"disabled results in a single SDI stream of 422 output - This is the default")
+               ->text(L"external results in a 4224 stream across 2 SDI connectors, ")
+               ->text(L"internal results in a 422 output keyed over the incoming SDI input using the dedicated hardware keyer on the Bleufish hadrware");
+       sink.para()->text(L"Specify ")->code(L"internal-keyer-audio-source")->text(L" to control the source of the audio and ANC data when using the internal/hardware keyer");
 
        sink.para()->text(L"Examples:");
        sink.example(L">> ADD 1 BLUEFISH", L"uses the default device_index of 1.");
        sink.example(L">> ADD 1 BLUEFISH 2", L"for device_index 2.");
        sink.example(
                L">> ADD 1 BLUEFISH 1 EMBEDDED_AUDIO\n"
+
                L">> ADD 1 BLUEFISH 2 KEY_ONLY", L"uses device with index 1 as fill output with audio and device with index 2 as key output.");
 
 }
@@ -710,12 +784,13 @@ spl::shared_ptr<core::frame_consumer> create_consumer(    const std::vector<std::ws
        if(params.size() < 1 || !boost::iequals(params.at(0), L"BLUEFISH"))
                return core::frame_consumer::empty();
 
-       const auto device_index = params.size() > 1 ? boost::lexical_cast<int>(params.at(1)) : 1;
-
-       const auto embedded_audio       = contains_param(       L"EMBEDDED_AUDIO",      params);
-       const auto key_only                     = contains_param(       L"KEY_ONLY",            params);
-       const auto channel_layout       = get_param(            L"CHANNEL_LAYOUT",      params);
-       const auto device_stream        = contains_param(       L"SDI-STREAM",          params);
+       const auto device_index                 = params.size() > 1 ? boost::lexical_cast<int>(params.at(1)) : 1;
+       const auto device_stream                = contains_param(       L"SDI-STREAM", params);
+       const auto embedded_audio               = contains_param(       L"EMBEDDED_AUDIO",      params);
+       const auto key_only                             = contains_param(       L"KEY_ONLY",            params);
+       const auto channel_layout               = get_param(            L"CHANNEL_LAYOUT",      params);
+       const auto keyer_option                 = contains_param(       L"KEYER",                       params);
+       const auto keyer_audio_option   = contains_param(       L"INTERNAL-KEYER-AUDIO-SOURCE", params);
 
        auto layout = core::audio_channel_layout::invalid();
 
@@ -728,33 +803,30 @@ spl::shared_ptr<core::frame_consumer> create_consumer(    const std::vector<std::ws
 
                layout = *found_layout;
        }
-       bluefish_hardware_output_channel device_output_channel = bluefish_hardware_output_channel::hardware_4224_channel_a;
-
-       if (contains_param(L"BLUE_4224_CHANNELA", params))
-               device_output_channel = bluefish_hardware_output_channel::hardware_4224_channel_a;
-       else if (contains_param(L"BLUE_4224_CHANNELC", params))
-               device_output_channel = bluefish_hardware_output_channel::hardware_4224_channel_c;
-       else if (contains_param(L"BLUE_422_CHANNELA", params))
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_a;
-       else if (contains_param(L"BLUE_422_CHANNELB", params))
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_b;
-       else if (contains_param(L"BLUE_422_CHANNELC", params))
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_c;
-       else if (contains_param(L"BLUE_422_CHANNELD", params))
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_d;
 
-       hardware_downstream_keyer_mode keyer = hardware_downstream_keyer_mode::disable;
+       bluefish_hardware_output_channel device_output_channel = bluefish_hardware_output_channel::channel_a;
+       if (contains_param(L"A", params))
+               device_output_channel = bluefish_hardware_output_channel::channel_a;
+       else if (contains_param(L"B", params))
+               device_output_channel = bluefish_hardware_output_channel::channel_b;
+       else if (contains_param(L"C", params))
+               device_output_channel = bluefish_hardware_output_channel::channel_c;
+       else if (contains_param(L"D", params))
+               device_output_channel = bluefish_hardware_output_channel::channel_d;
 
-       if (contains_param(L"KEYER_DISABLED", params))
+       hardware_downstream_keyer_mode keyer = hardware_downstream_keyer_mode::disable;
+       if (contains_param(L"DISABLED", params))
                keyer = hardware_downstream_keyer_mode::disable;
-       else if (contains_param(L"KEYER_ENABLED", params))
-               keyer = hardware_downstream_keyer_mode::enable;
+       else if (contains_param(L"EXTERNAL", params))
+               keyer = hardware_downstream_keyer_mode::external;
+       else if (contains_param(L"INTERNAL", params))
+               keyer = hardware_downstream_keyer_mode::internal;
 
        hardware_downstream_keyer_audio_source keyer_audio_source = hardware_downstream_keyer_audio_source::VideoOutputChannel;
-       if (contains_param(L"KEYER_AUDIO_SOURCE_SDIINPUT", params))
+       if (contains_param(L"SDIVIDEOINPUT", params))
                keyer_audio_source = hardware_downstream_keyer_audio_source::SDIVideoInput;
        else
-       if (contains_param(L"KEYER_AUDIO_SOURCE_OUTPUT_CHANNEL", params))
+       if (contains_param(L"VIDEOOUTPUTCHANNEL", params))
                keyer_audio_source = hardware_downstream_keyer_audio_source::VideoOutputChannel;
 
        return spl::make_shared<bluefish_consumer_proxy>(device_index, embedded_audio, key_only, keyer, keyer_audio_source, layout, device_output_channel);
@@ -763,14 +835,14 @@ spl::shared_ptr<core::frame_consumer> create_consumer(    const std::vector<std::ws
 spl::shared_ptr<core::frame_consumer> create_preconfigured_consumer(
                                                                                        const boost::property_tree::wptree& ptree, core::interaction_sink*,
                                                                                        std::vector<spl::shared_ptr<core::video_channel>> channels)
-{      
+{
        const auto device_index         = ptree.get(                                            L"device",                      1);
+       const auto device_stream        = ptree.get(                                            L"sdi-stream", L"a");
        const auto embedded_audio       = ptree.get(                                            L"embedded-audio",      false);
        const auto key_only                     = ptree.get(                                            L"key-only",            false);
        const auto channel_layout       = ptree.get_optional<std::wstring>(     L"channel-layout");
-       const auto hardware_keyer_value = ptree.get(L"hardware-keyer", L"disabled");
-       const auto keyer_audio_source_value = ptree.get(L"hardware-keyer-audio-source", L"videooutputchannel");
-       const auto device_stream = ptree.get(L"sdi-stream", L"blue_4224_channela");
+       const auto hardware_keyer_value = ptree.get(                                    L"keyer", L"disabled");
+       const auto keyer_audio_source_value = ptree.get(                                L"internal-keyer-audio-source", L"videooutputchannel");
 
        auto layout = core::audio_channel_layout::invalid();
 
@@ -786,29 +858,23 @@ spl::shared_ptr<core::frame_consumer> create_preconfigured_consumer(
                layout = *found_layout;
        }
 
-       bluefish_hardware_output_channel device_output_channel = bluefish_hardware_output_channel::hardware_4224_channel_a;
-       if (device_stream == L"blue_4224_channela")
-               device_output_channel = bluefish_hardware_output_channel::hardware_4224_channel_a;
-       else if (device_stream == L"blue_4224_channelc")
-               device_output_channel = bluefish_hardware_output_channel::hardware_4224_channel_c;
-       else if (device_stream == L"blue_422_channela")
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_a;
-       else if (device_stream == L"blue_422_channelb")
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_b;
-       else if (device_stream == L"blue_422_channelc")
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_c;
-       else if (device_stream == L"blue_422_channeld")
-               device_output_channel = bluefish_hardware_output_channel::hardware_422_channel_d;
+       bluefish_hardware_output_channel device_output_channel = bluefish_hardware_output_channel::channel_a;
+       if (device_stream == L"a")
+               device_output_channel = bluefish_hardware_output_channel::channel_a;
+       else if (device_stream == L"b")
+               device_output_channel = bluefish_hardware_output_channel::channel_b;
+       else if (device_stream == L"c")
+               device_output_channel = bluefish_hardware_output_channel::channel_c;
+       else if (device_stream == L"d")
+               device_output_channel = bluefish_hardware_output_channel::channel_d;
 
        hardware_downstream_keyer_mode keyer_mode = hardware_downstream_keyer_mode::disable;
        if (hardware_keyer_value == L"disabled")
-       {
                keyer_mode = hardware_downstream_keyer_mode::disable;
-       }
-       else if (hardware_keyer_value == L"enabled")
-       {
-               keyer_mode = hardware_downstream_keyer_mode::enable;
-       }
+       else if (hardware_keyer_value == L"external")
+               keyer_mode = hardware_downstream_keyer_mode::external;
+       else if (hardware_keyer_value == L"internal")
+               keyer_mode = hardware_downstream_keyer_mode::internal;
 
        hardware_downstream_keyer_audio_source keyer_audio_source = hardware_downstream_keyer_audio_source::VideoOutputChannel;
        if (keyer_audio_source_value == L"videooutputchannel")
@@ -820,4 +886,4 @@ spl::shared_ptr<core::frame_consumer> create_preconfigured_consumer(
        return spl::make_shared<bluefish_consumer_proxy>(device_index, embedded_audio, key_only, keyer_mode, keyer_audio_source, layout, device_output_channel);
 }
 
-}}
\ No newline at end of file
+}}