2.0.0.2: - decklink: Refactoring.

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

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 4c5507ad2a876454bde7b44e853323c70c92693f..55df8d2ae59056b01cf4eced1ba79db91d966f67 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -167,7 +167,6 @@ public:
                if(!config.embedded_audio)\r
                        start_playback();\r
                                \r
-               CASPAR_LOG(info) << print() << L" Buffer depth: " << buffer_size_;              \r
                CASPAR_LOG(info) << print() << L" Successfully Initialized.";   \r
        }\r
 \r
@@ -278,15 +277,11 @@ public:
                        else if(result == bmdOutputFrameFlushed)\r
                                graph_->add_tag("flushed-frame");\r
 \r
-                       frame_container_.erase(std::find_if(frame_container_.begin(), frame_container_.end(), [&](const std::shared_ptr<IDeckLinkVideoFrame> frame)\r
-                       {\r
-                               return frame.get() == completed_frame;\r
-                       }));\r
+                       frame_container_.erase(std::find_if(frame_container_.begin(), frame_container_.end(), completed_frame));\r
 \r
                        std::shared_ptr<const core::read_frame> frame;  \r
-                       video_frame_buffer_.pop(frame);         \r
-                       \r
-                       schedule_next_video(safe_ptr<const core::read_frame>(frame));                   \r
+                       video_frame_buffer_.pop(frame);                                 \r
+                       schedule_next_video(make_safe(frame));                  \r
                }\r
                catch(...)\r
                {\r
@@ -318,7 +313,7 @@ public:
                        {\r
                                std::shared_ptr<const core::read_frame> frame;\r
                                audio_frame_buffer_.pop(frame);\r
-                               schedule_next_audio(safe_ptr<const core::read_frame>(frame));   \r
+                               schedule_next_audio(make_safe(frame));  \r
                        }\r
                }\r
                catch(...)\r
@@ -337,8 +332,8 @@ public:
                const int sample_count = format_desc_.audio_samples_per_frame;\r
                const int sample_frame_count = sample_count/2;\r
 \r
-               const short* frame_audio_data = frame->audio_data().size() == sample_count ? frame->audio_data().begin() : silence.data();\r
-               audio_container_.push_back(std::vector<short>(frame_audio_data, frame_audio_data+sample_count));\r
+               const int16_t* frame_audio_data = frame->audio_data().size() == sample_count ? frame->audio_data().begin() : silence.data();\r
+               audio_container_.push_back(std::vector<int16_t>(frame_audio_data, frame_audio_data+sample_count));\r
 \r
                if(FAILED(output_->ScheduleAudioSamples(audio_container_.back().data(), sample_frame_count, (audio_scheduled_++) * sample_frame_count, format_desc_.audio_sample_rate, nullptr)))\r
                        CASPAR_LOG(error) << print() << L" Failed to schedule audio.";\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 7b3e46d4b9c2c0fa52e18f7dcef02614a4f9ceb6..4dc625803535153098dc70075389805b150848c5 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -108,7 +108,7 @@ public:
                if(FAILED(input_->StartStreams()))\r
                        BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to start input stream."));\r
 \r
-               CASPAR_LOG(info) << print() << " successfully initialized decklink for " << format_desc_.name;\r
+               CASPAR_LOG(info) << print() << L" Successfully Initialized.";\r
        }\r
 \r
        ~decklink_producer()\r