2.0. decklink_producer: Fixed audio regression bug. Improved params. Added nb_frames...

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1331 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index f5734796641bd2b7354fadf797abd3e590590c6b..420256641861cd0e3bbd44bbdd16fd89895defdd 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -124,7 +124,7 @@ public:
                                                                        << msg_info(narrow(print()) + " Could not enable video input.")\r
                                                                        << boost::errinfo_api_function("EnableVideoInput"));\r
 \r
-               if(FAILED(input_->EnableAudioInput(bmdAudioSampleRate48kHz, bmdAudioSampleType32bitInteger, 2))) \r
+               if(FAILED(input_->EnableAudioInput(bmdAudioSampleRate48kHz, bmdAudioSampleType32bitInteger, format_desc_.audio_channels))) \r
                        BOOST_THROW_EXCEPTION(caspar_exception() \r
                                                                        << msg_info(narrow(print()) + " Could not enable audio input.")\r
                                                                        << boost::errinfo_api_function("EnableAudioInput"));\r
@@ -195,7 +195,7 @@ public:
                        {\r
                                auto sample_frame_count = audio->GetSampleFrameCount();\r
                                auto audio_data = reinterpret_cast<int32_t*>(bytes);\r
-                               muxer_.push(std::make_shared<core::audio_buffer>(audio_data, audio_data + sample_frame_count*sizeof(int32_t)));\r
+                               muxer_.push(std::make_shared<core::audio_buffer>(audio_data, audio_data + sample_frame_count*format_desc_.audio_channels));\r
                        }\r
                        else\r
                                muxer_.push(std::make_shared<core::audio_buffer>(frame_factory_->get_video_format_desc().audio_samples_per_frame, 0));\r
@@ -241,16 +241,25 @@ public:
        \r
 class decklink_producer_proxy : public core::frame_producer\r
 {              \r
-       safe_ptr<core::basic_frame>     last_frame_;\r
-       com_context<decklink_producer> context_;\r
+       safe_ptr<core::basic_frame>             last_frame_;\r
+       com_context<decklink_producer>  context_;\r
+       const int64_t                                   length_;\r
 public:\r
 \r
-       explicit decklink_producer_proxy(const safe_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, size_t device_index, const std::wstring& filter_str = L"")\r
+       explicit decklink_producer_proxy(const safe_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, size_t device_index, const std::wstring& filter_str, int64_t length)\r
                : context_(L"decklink_producer[" + boost::lexical_cast<std::wstring>(device_index) + L"]")\r
                , last_frame_(core::basic_frame::empty())\r
+               , length_(length)\r
        {\r
                context_.reset([&]{return new decklink_producer(format_desc, device_index, frame_factory, filter_str);}); \r
        }\r
+\r
+       ~decklink_producer_proxy()\r
+       {\r
+               auto str = print();\r
+               context_.reset();\r
+               CASPAR_LOG(info) << str << L" Successfully Uninitialized.";     \r
+       }\r
                                \r
        virtual safe_ptr<core::basic_frame> receive(int)\r
        {\r
@@ -265,6 +274,11 @@ public:
                return disable_audio(last_frame_);\r
        }\r
        \r
+       virtual int64_t nb_frames() const \r
+       {\r
+               return length_;\r
+       }\r
+       \r
        std::wstring print() const\r
        {\r
                return context_->print();\r
@@ -276,28 +290,19 @@ safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::fra
        if(params.empty() || !boost::iequals(params[0], "decklink"))\r
                return core::frame_producer::empty();\r
 \r
-       size_t device_index = 1;\r
-       if(params.size() > 1)\r
-               device_index = lexical_cast_or_default(params[1], 1);\r
-\r
-       core::video_format_desc format_desc = core::video_format_desc::get(L"PAL");\r
-       if(params.size() > 2)\r
-       {\r
-               auto desc = core::video_format_desc::get(params[2]);\r
-               if(desc.format != core::video_format::invalid)\r
-                       format_desc = desc;\r
-       }\r
+       auto device_index       = core::get_param(L"DEVICE", params, 1);\r
+       auto filter_str         = core::get_param<std::wstring>(L"FILTER", params, L"");        \r
+       auto length                     = core::get_param(L"LENGTH", params, std::numeric_limits<int64_t>::max());      \r
        \r
-       std::wstring filter_str = L"";\r
+       boost::replace_all(filter_str, L"DEINTERLACE", L"YADIF=0:-1");\r
+       boost::replace_all(filter_str, L"DEINTERLACE_BOB", L"YADIF=1:-1");\r
 \r
-       auto filter_it = std::find(params.begin(), params.end(), L"FILTER");\r
-       if(filter_it != params.end())\r
-       {\r
-               if(++filter_it != params.end())\r
-                       filter_str = *filter_it;\r
-       }\r
+       auto format_desc        = core::video_format_desc::get(core::get_param<std::wstring>(L"FORMAT", params, L"INVALID"));\r
 \r
-       return make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str);\r
+       if(format_desc.format == core::video_format::invalid)\r
+               format_desc = frame_factory->get_video_format_desc();\r
+                       \r
+       return make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str, length);\r
 }\r
 \r
 }
\ No newline at end of file