]> git.sesse.net Git - casparcg/commitdiff
* Merged streaming_consumer from 2.0
authorHelge Norberg <helge.norberg@svt.se>
Tue, 16 Jun 2015 15:33:43 +0000 (17:33 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Tue, 16 Jun 2015 15:33:43 +0000 (17:33 +0200)
* Merged <CLIENT_IP_ADDRESS> paceholder support on ADD and REMOVE commands
* Made consumers support mixed case parameters, allowing streaming_consumer to work correctly.
* Modified newtek_ivga_consumer AMCP construction to require the parameter DONT_PROVIDE_SYNC instead of the parameter PROVIDE_SYNC, which makes more sense since the default is to provide sync.

30 files changed:
common/CMakeLists.txt
common/executor.h
common/param.h
common/scope_exit.h [new file with mode: 0644]
core/producer/color/color_producer.cpp
core/producer/scene/scene_producer.cpp
core/producer/scene/xml_scene_producer.cpp
modules/bluefish/consumer/bluefish_consumer.cpp
modules/decklink/consumer/decklink_consumer.cpp
modules/decklink/producer/decklink_producer.cpp
modules/ffmpeg/CMakeLists.txt
modules/ffmpeg/consumer/ffmpeg_consumer.cpp
modules/ffmpeg/consumer/streaming_consumer.cpp [new file with mode: 0644]
modules/ffmpeg/consumer/streaming_consumer.h [new file with mode: 0644]
modules/ffmpeg/ffmpeg.cpp
modules/ffmpeg/util/error.cpp [new file with mode: 0644]
modules/ffmpeg/util/error.h [new file with mode: 0644]
modules/flash/flash.cpp
modules/image/consumer/image_consumer.cpp
modules/image/producer/image_producer.cpp
modules/image/producer/image_scroll_producer.cpp
modules/newtek/consumer/newtek_ivga_consumer.cpp
modules/oal/consumer/oal_consumer.cpp
modules/psd/psd_scene_producer.cpp
modules/screen/consumer/screen_consumer.cpp
protocol/amcp/AMCPCommandsImpl.cpp
protocol/util/AsyncEventServer.cpp
protocol/util/ClientInfo.h
protocol/util/protocol_strategy.h
protocol/util/strategy_adapters.cpp

index b5f748d07674b58f436d1abd27368c47a64db142..73c97002a62f3a025899a46df56637c3276c9f8a 100644 (file)
@@ -77,6 +77,7 @@ set(HEADERS
                polling_filesystem_monitor.h
                prec_timer.h
                reactive.h
+               scope_exit.h
                semaphore.h
                stdafx.h
                timer.h
index aec4876342bd277096787a40b6ba1c856138171e..d812c98e1f806b83164e389fc0eff419ab56daf4 100644 (file)
@@ -91,6 +91,11 @@ public:
                        CASPAR_LOG_CURRENT_EXCEPTION();
                }
                
+               join();
+       }
+
+       void join()
+       {
                thread_.join();
        }
 
index 62cfeb2d1a5748f1b31dcf56c9583496f9050daf..5f459cb03342ad958805cd5a5f56f659e75da044 100644 (file)
 
 namespace caspar {
 
-class param_comparer {
-               const std::wstring& lhs;
-       public:
-               explicit param_comparer(const std::wstring& p) : lhs(p) {}
-               bool operator()(const std::wstring& rhs) { return boost::iequals(lhs, rhs); }
-       };
+class param_comparer
+{
+       const std::wstring& lhs;
+public:
+       explicit param_comparer(const std::wstring& p) : lhs(p) {}
+       bool operator()(const std::wstring& rhs) { return boost::iequals(lhs, rhs); }
+};
 
 template<typename C>
 bool contains_param(const std::wstring& name, C&& params)
@@ -23,6 +24,13 @@ bool contains_param(const std::wstring& name, C&& params)
        return std::find_if(params.begin(), params.end(), param_comparer(name)) != params.end();
 }
 
+template<typename C>
+void replace_placeholders(const std::wstring& placeholder, const std::wstring& replacement, C&& params)
+{
+       for (auto& param : params)
+               boost::ireplace_all(param, placeholder, replacement);
+}
+
 template<typename T, typename C>
 typename std::enable_if<!std::is_convertible<T, std::wstring>::value, typename std::decay<T>::type>::type get_param(const std::wstring& name, C&& params, T fail_value = T())
 {      
diff --git a/common/scope_exit.h b/common/scope_exit.h
new file mode 100644 (file)
index 0000000..7509660
--- /dev/null
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "except.h"
+
+#include <functional>
+
+namespace caspar {
+
+namespace detail 
+{
+    template<typename T>
+    class scope_exit
+    {
+               scope_exit(const scope_exit&);
+               scope_exit& operator=(const scope_exit&);
+    public:         
+
+               template<typename T2>
+        explicit scope_exit(T2&& func) 
+                       : func_(std::forward<T2>(func))
+                       , valid_(true)
+               {
+               }
+               
+               scope_exit(scope_exit&& other)
+                       : func_(std::move(other.v))
+                       , valid_(std::move(other.valid_))
+               {
+                       other.valid_ = false;
+               }
+
+               scope_exit& operator=(scope_exit&& other)
+               {
+                       func_  = std::move(other.func_);
+                       valid_ = std::move(other.valid_);
+
+                       other.valid_ = false;
+
+                       return *this;
+               }
+
+        ~scope_exit()
+               {
+                       try
+                       {
+                               if(valid_)
+                                       func_();
+                       }
+                       catch(...)
+                       {
+                               if(!std::uncaught_exception()) 
+                                       throw;
+                               else
+                                       CASPAR_LOG_CURRENT_EXCEPTION();
+                       }
+               }
+    private:
+        T func_;
+               bool valid_;
+    };          
+       
+       class scope_exit_helper {};
+
+       template <typename T>
+       scope_exit<typename std::decay<T>::type> operator+(scope_exit_helper, T&& exitScope)
+       {
+               return scope_exit<typename std::decay<T>::type>(std::forward<T>(exitScope));
+       }
+}
+
+#define _CASPAR_EXIT_SCOPE_LINENAME_CAT(name, line) name##line
+#define _CASPAR_EXIT_SCOPE_LINENAME(name, line) _CASPAR_EXIT_SCOPE_LINENAME_CAT(name, line)
+#define CASPAR_SCOPE_EXIT auto _CASPAR_EXIT_SCOPE_LINENAME(EXIT, __LINE__) = ::caspar::detail::scope_exit_helper() + [&]() mutable
+
+}
\ No newline at end of file
index 281b9619fde549e7fecbc8ba01869475a3e95dea..dc94a6e6e8811ca8d2e815d558eb7505416d766c 100644 (file)
@@ -167,10 +167,10 @@ spl::shared_ptr<frame_producer> create_color_producer(const spl::shared_ptr<fram
                return core::frame_producer::empty();
 
        uint32_t value = 0;
-       if(!try_get_color(params[0], value))
+       if(!try_get_color(params.at(0), value))
                return core::frame_producer::empty();
 
-       return spl::make_shared<color_producer>(frame_factory, params[0]);
+       return spl::make_shared<color_producer>(frame_factory, params.at(0));
 }
 
 draw_frame create_color_frame(void* tag, const spl::shared_ptr<frame_factory>& frame_factory, uint32_t value)
index 7635dd305fa7ff64db58be66ddf70a72c105efce..ea447741f8de5b391306e4bda5a6b8f3b6eedfe1 100644 (file)
@@ -411,10 +411,10 @@ struct scene_producer::impl
        {
                for (int i = 0; i + 1 < params.size(); i += 2)
                {
-                       auto found = variables_.find(boost::to_lower_copy(params[i]));
+                       auto found = variables_.find(boost::to_lower_copy(params.at(i)));
 
                        if (found != variables_.end() && found->second->is_public())
-                               found->second->from_string(params[i + 1]);
+                               found->second->from_string(params.at(i + 1));
                }
 
                return L"";
index b876e6d619eca026be970e8a2dccc60f5466f0e8..aae04601423a07c603fd87e0dd937092318ac08b 100644 (file)
@@ -63,6 +63,7 @@ void deduce_expression(variable& var, const variable_repository& repo)
 
 void init(module_dependencies dependencies)
 {
+       register_producer_factory(create_xml_scene_producer);
        dependencies.cg_registry->register_cg_producer(
                        L"scene",
                        { L".scene" },
@@ -89,7 +90,7 @@ spl::shared_ptr<core::frame_producer> create_xml_scene_producer(
        if (params.empty())
                return core::frame_producer::empty();
 
-       std::wstring filename = env::template_folder() + L"/" + params[0] + L".scene";
+       std::wstring filename = env::template_folder() + L"/" + params.at(0) + L".scene";
        
        if (!boost::filesystem::is_regular_file(boost::filesystem::path(filename)))
                return core::frame_producer::empty();
index 06b94899224a24e2f38ca08958e1289c3039dcec..d85f934b8065755fa53a73b6556b646c7b0d311c 100644 (file)
@@ -32,6 +32,7 @@
 #include <common/diagnostics/graph.h>
 #include <common/array.h>
 #include <common/memshfl.h>
+#include <common/param.h>
 
 #include <core/consumer/frame_consumer.h>
 #include <core/mixer/audio/audio_util.h>
@@ -43,6 +44,7 @@
 #include <boost/timer.hpp>
 #include <boost/range/algorithm.hpp>
 #include <boost/property_tree/ptree.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include <asmlib.h>
 
@@ -374,13 +376,13 @@ public:
 spl::shared_ptr<core::frame_consumer> create_consumer(
                const std::vector<std::wstring>& params, core::interaction_sink*)
 {
-       if(params.size() < 1 || params[0] != L"BLUEFISH")
+       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[1]) : 1;
+       const auto device_index = params.size() > 1 ? boost::lexical_cast<int>(params.at(1)) : 1;
 
-       const auto embedded_audio = std::find(params.begin(), params.end(), L"EMBEDDED_AUDIO") != params.end();
-       const auto key_only               = std::find(params.begin(), params.end(), L"KEY_ONLY")           != params.end();
+       const auto embedded_audio       = contains_param(L"EMBEDDED_AUDIO", params);
+       const auto key_only                     = contains_param(L"KEY_ONLY", params);
 
        return spl::make_shared<bluefish_consumer_proxy>(device_index, embedded_audio, key_only);
 }
index 216db31c5c77b133e3adb095e8ae6ef6f5f28ff6..81a35fad7153153b6b2b9b64d26e2bfeca2b1463 100644 (file)
@@ -39,6 +39,7 @@
 #include <common/future.h>
 #include <common/cache_aligned_vector.h>
 #include <common/timer.h>
+#include <common/param.h>
 
 #include <core/consumer/frame_consumer.h>
 #include <core/diagnostics/call_context.h>
@@ -580,26 +581,26 @@ public:
 spl::shared_ptr<core::frame_consumer> create_consumer(
                const std::vector<std::wstring>& params, core::interaction_sink*)
 {
-       if(params.size() < 1 || params[0] != L"DECKLINK")
+       if (params.size() < 1 || !boost::iequals(params.at(0), L"DECKLINK"))
                return core::frame_consumer::empty();
        
        configuration config;
                
-       if(params.size() > 1)
-               config.device_index = boost::lexical_cast<int>(params[1]);
+       if (params.size() > 1)
+               config.device_index = boost::lexical_cast<int>(params.at(1));
        
-       if(std::find(params.begin(), params.end(), L"INTERNAL_KEY")                     != params.end())
+       if (contains_param(L"INTERNAL_KEY", params))
                config.keyer = configuration::keyer_t::internal_keyer;
-       else if(std::find(params.begin(), params.end(), L"EXTERNAL_KEY")        != params.end())
+       else if (contains_param(L"EXTERNAL_KEY", params))
                config.keyer = configuration::keyer_t::external_keyer;
        else
                config.keyer = configuration::keyer_t::default_keyer;
 
-       if(std::find(params.begin(), params.end(), L"LOW_LATENCY")       != params.end())
+       if (contains_param(L"LOW_LATENCY", params))
                config.latency = configuration::latency_t::low_latency;
 
-       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();
+       config.embedded_audio   = contains_param(L"EMBEDDED_AUDIO", params);
+       config.key_only                 = contains_param(L"KEY_ONLY", params);
 
        return spl::make_shared<decklink_consumer_proxy>(config);
 }
index 6feeca7fa682b214650e40cf4129f617b684897a..7edafadffefd4733b0197e5314a810790e1664fe 100644 (file)
@@ -364,7 +364,7 @@ public:
 
 spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& out_format_desc, const std::vector<std::wstring>& params)
 {
-       if(params.empty() || !boost::iequals(params[0], "decklink"))
+       if(params.empty() || !boost::iequals(params.at(0), "decklink"))
                return core::frame_producer::empty();
 
        auto device_index       = get_param(L"DEVICE", params, -1);
index 6f92cf78a754ae1cfde78e88c2ab329719f40946..52f374502ba68e13151040cf638b3925afeeefec 100644 (file)
@@ -3,6 +3,7 @@ project (ffmpeg)
 
 set(SOURCES
                consumer/ffmpeg_consumer.cpp
+               consumer/streaming_consumer.cpp
 
                producer/audio/audio_decoder.cpp
 
@@ -20,12 +21,15 @@ set(SOURCES
                producer/ffmpeg_producer.cpp
                producer/tbb_avcodec.cpp
 
+               util/error.cpp
+
                ffmpeg.cpp
                ffmpeg_error.cpp
                StdAfx.cpp
 )
 set(HEADERS
                consumer/ffmpeg_consumer.h
+               consumer/streaming_consumer.h
 
                producer/audio/audio_decoder.h
 
@@ -44,6 +48,8 @@ set(HEADERS
                producer/ffmpeg_producer.h
                producer/tbb_avcodec.h
 
+               util/error.h
+
                ffmpeg.h
                ffmpeg_error.h
                StdAfx.h
index ee34016992036eec9f43e2c16e837acecfa55e66..5c0b02949207b4266ea1790eeb12b747f88957cd 100644 (file)
@@ -852,7 +852,7 @@ spl::shared_ptr<core::frame_consumer> create_consumer(
                const std::vector<std::wstring>& params, core::interaction_sink*)
 {
        auto params2 = params;
-       auto separate_key_it = std::find(params2.begin(), params2.end(), L"SEPARATE_KEY");
+       auto separate_key_it = std::find_if(params2.begin(), params2.end(), param_comparer(L"SEPARATE_KEY"));
        bool separate_key = false;
 
        if (separate_key_it != params2.end())
diff --git a/modules/ffmpeg/consumer/streaming_consumer.cpp b/modules/ffmpeg/consumer/streaming_consumer.cpp
new file mode 100644 (file)
index 0000000..21beb81
--- /dev/null
@@ -0,0 +1,1275 @@
+#include "../StdAfx.h"
+
+#include "ffmpeg_consumer.h"
+
+#include "../util/error.h"
+
+#include <common/except.h>
+#include <common/executor.h>
+#include <common/assert.h>
+#include <common/utf.h>
+#include <common/future.h>
+#include <common/env.h>
+#include <common/scope_exit.h>
+
+#include <core/consumer/frame_consumer.h>
+#include <core/frame/frame.h>
+#include <core/video_format.h>
+#include <core/monitor/monitor.h>
+
+#include <boost/noncopyable.hpp>
+#include <boost/rational.hpp>
+#include <boost/format.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#pragma warning(push)
+#pragma warning(disable: 4244)
+#pragma warning(disable: 4245)
+#include <boost/crc.hpp>
+#pragma warning(pop)
+
+#include <tbb/atomic.h>
+#include <tbb/concurrent_queue.h>
+#include <tbb/parallel_invoke.h>
+#include <tbb/parallel_for.h>
+
+#include <agents.h>
+#include <numeric>
+
+#pragma warning(push)
+#pragma warning(disable: 4244)
+
+extern "C" 
+{
+       #define __STDC_CONSTANT_MACROS
+       #define __STDC_LIMIT_MACROS
+       #include <libavformat/avformat.h>
+       #include <libavcodec/avcodec.h>
+       #include <libavutil/avutil.h>
+       #include <libavutil/frame.h>
+       #include <libavutil/opt.h>
+       #include <libavutil/imgutils.h>
+       #include <libavutil/parseutils.h>
+       #include <libavfilter/avfilter.h>
+       #include <libavfilter/buffersink.h>
+       #include <libavfilter/buffersrc.h>
+}
+
+#pragma warning(pop)
+
+using namespace Concurrency;
+
+namespace caspar { namespace ffmpeg {
+
+int crc16(const std::string& str)
+{
+       boost::crc_16_type result;
+
+       result.process_bytes(str.data(), str.length());
+
+       return result.checksum();
+}
+
+class streaming_consumer final : public core::frame_consumer
+{
+public:
+       // Static Members
+               
+private:
+       core::monitor::subject                                          subject_;
+       boost::filesystem::path                                         path_;
+       int                                                                                     consumer_index_offset_;
+
+       std::map<std::string, std::string>                      options_;
+                                                                                               
+       core::video_format_desc                                         in_video_format_;
+
+       std::shared_ptr<AVFormatContext>                        oc_;
+       tbb::atomic<bool>                                                       abort_request_;
+                                                                                               
+       std::shared_ptr<AVStream>                                       video_st_;
+       std::shared_ptr<AVStream>                                       audio_st_;
+
+       std::int64_t                                                            video_pts_;
+       std::int64_t                                                            audio_pts_;
+                                                                                                                                                                       
+    AVFilterContext*                                                   audio_graph_in_;  
+    AVFilterContext*                                                   audio_graph_out_; 
+    std::shared_ptr<AVFilterGraph>                             audio_graph_;    
+       std::shared_ptr<AVBitStreamFilterContext>       audio_bitstream_filter_;       
+
+    AVFilterContext*                                                   video_graph_in_;  
+    AVFilterContext*                                                   video_graph_out_; 
+    std::shared_ptr<AVFilterGraph>                             video_graph_;  
+       std::shared_ptr<AVBitStreamFilterContext>       video_bitstream_filter_;
+       
+       executor                                                                        executor_;
+
+       executor                                                                        video_encoder_executor_;
+       executor                                                                        audio_encoder_executor_;
+
+       tbb::atomic<int>                                                        tokens_;
+       boost::mutex                                                            tokens_mutex_;
+       boost::condition_variable                                       tokens_cond_;
+
+       executor                                                                        write_executor_;
+       
+public:
+
+       streaming_consumer(
+                       std::string path, 
+                       std::string options)
+               : path_(path)
+               , consumer_index_offset_(crc16(path))
+               , video_pts_(0)
+               , audio_pts_(0)
+               , executor_(print())
+               , audio_encoder_executor_(print() + L" audio_encoder")
+               , video_encoder_executor_(print() + L" video_encoder")
+               , write_executor_(print() + L" io")
+       {               
+               abort_request_ = false; 
+
+               for(auto it = 
+                               boost::sregex_iterator(
+                                       options.begin(), 
+                                       options.end(), 
+                                       boost::regex("-(?<NAME>[^-\\s]+)(\\s+(?<VALUE>[^\\s]+))?")); 
+                       it != boost::sregex_iterator(); 
+                       ++it)
+               {                               
+                       options_[(*it)["NAME"].str()] = (*it)["VALUE"].matched ? (*it)["VALUE"].str() : "";
+               }
+                                                                               
+        if (options_.find("threads") == options_.end())
+            options_["threads"] = "auto";
+
+               tokens_ = 
+                       std::max(
+                               1, 
+                               try_remove_arg<int>(
+                                       options_, 
+                                       boost::regex("tokens")).get_value_or(2));               
+       }
+               
+       ~streaming_consumer()
+       {
+               if(oc_)
+               {
+                       video_encoder_executor_.begin_invoke([&] { encode_video(core::const_frame::empty(), nullptr); });
+                       audio_encoder_executor_.begin_invoke([&] { encode_audio(core::const_frame::empty(), nullptr); });
+
+                       video_encoder_executor_.stop();
+                       audio_encoder_executor_.stop();
+                       video_encoder_executor_.join();
+                       audio_encoder_executor_.join();
+
+                       video_graph_.reset();
+                       audio_graph_.reset();
+                       video_st_.reset();
+                       audio_st_.reset();
+
+                       write_packet(nullptr, nullptr);
+
+                       write_executor_.stop();
+                       write_executor_.join();
+
+                       FF(av_write_trailer(oc_.get()));
+
+                       if (!(oc_->oformat->flags & AVFMT_NOFILE) && oc_->pb)
+                               avio_close(oc_->pb);
+
+                       oc_.reset();
+               }
+       }
+
+       void initialize(
+                       const core::video_format_desc& format_desc,
+                       int channel_index) override
+       {
+               try
+               {                               
+                       static boost::regex prot_exp("^.+:.*" );
+                       
+                       const auto overwrite = 
+                               try_remove_arg<std::string>(
+                                       options_,
+                                       boost::regex("y")) != nullptr;
+
+                       if(!boost::regex_match(
+                                       path_.string(), 
+                                       prot_exp))
+                       {
+                               if(!path_.is_complete())
+                               {
+                                       path_ = 
+                                               u8(
+                                                       env::media_folder()) + 
+                                                       path_.string();
+                               }
+                       
+                               if(boost::filesystem::exists(path_))
+                               {
+                                       if(!overwrite)
+                                               BOOST_THROW_EXCEPTION(invalid_argument() << msg_info("File exists"));
+                                               
+                                       boost::filesystem::remove(path_);
+                               }
+                       }
+                                                       
+                       const auto oformat_name = 
+                               try_remove_arg<std::string>(
+                                       options_, 
+                                       boost::regex("^f|format$"));
+                       
+                       AVFormatContext* oc;
+
+                       FF(avformat_alloc_output_context2(
+                               &oc, 
+                               nullptr, 
+                               oformat_name && !oformat_name->empty() ? oformat_name->c_str() : nullptr, 
+                               path_.string().c_str()));
+
+                       oc_.reset(
+                               oc, 
+                               avformat_free_context);
+                                       
+                       CASPAR_VERIFY(oc_->oformat);
+
+                       oc_->interrupt_callback.callback = streaming_consumer::interrupt_cb;
+                       oc_->interrupt_callback.opaque   = this;        
+
+                       CASPAR_VERIFY(format_desc.format != core::video_format::invalid);
+
+                       in_video_format_ = format_desc;
+                                                       
+                       CASPAR_VERIFY(oc_->oformat);
+                       
+                       const auto video_codec_name = 
+                               try_remove_arg<std::string>(
+                                       options_, 
+                                       boost::regex("^c:v|codec:v|vcodec$"));
+
+                       const auto video_codec = 
+                               video_codec_name 
+                                       ? avcodec_find_encoder_by_name(video_codec_name->c_str())
+                                       : avcodec_find_encoder(oc_->oformat->video_codec);
+                                               
+                       const auto audio_codec_name = 
+                               try_remove_arg<std::string>(
+                                       options_, 
+                                        boost::regex("^c:a|codec:a|acodec$"));
+                       
+                       const auto audio_codec = 
+                               audio_codec_name 
+                                       ? avcodec_find_encoder_by_name(audio_codec_name->c_str())
+                                       : avcodec_find_encoder(oc_->oformat->audio_codec);
+                       
+                       if (!video_codec)
+                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(
+                                               "Failed to find video codec " + (video_codec_name
+                                                               ? *video_codec_name
+                                                               : "with id " + boost::lexical_cast<std::string>(
+                                                                               oc_->oformat->video_codec))));
+                       if (!audio_codec)
+                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(
+                                               "Failed to find audio codec " + (audio_codec_name
+                                                               ? *audio_codec_name
+                                                               : "with id " + boost::lexical_cast<std::string>(
+                                                                               oc_->oformat->audio_codec))));
+                       
+                       // Filters
+
+                       {
+                               configure_video_filters(
+                                       *video_codec, 
+                                       try_remove_arg<std::string>(options_, 
+                                       boost::regex("vf|f:v|filter:v")).get_value_or(""));
+
+                               configure_audio_filters(
+                                       *audio_codec, 
+                                       try_remove_arg<std::string>(options_,
+                                       boost::regex("af|f:a|filter:a")).get_value_or(""));
+                       }
+
+                       // Bistream Filters
+                       {
+                               configue_audio_bistream_filters(options_);
+                               configue_video_bistream_filters(options_);
+                       }
+
+                       // Encoders
+
+                       {
+                               auto video_options = options_;
+                               auto audio_options = options_;
+
+                               video_st_ = open_encoder(
+                                       *video_codec, 
+                                       video_options);
+
+                               audio_st_ = open_encoder(
+                                       *audio_codec, 
+                                       audio_options);
+
+                               auto it = options_.begin();
+                               while(it != options_.end())
+                               {
+                                       if(video_options.find(it->first) == video_options.end() || audio_options.find(it->first) == audio_options.end())
+                                               it = options_.erase(it);
+                                       else
+                                               ++it;
+                               }
+                       }
+
+                       // Output
+                       {
+                               AVDictionary* av_opts = nullptr;
+
+                               to_dict(
+                                       &av_opts, 
+                                       std::move(options_));
+
+                               CASPAR_SCOPE_EXIT
+                               {
+                                       av_dict_free(&av_opts);
+                               };
+
+                               if (!(oc_->oformat->flags & AVFMT_NOFILE)) 
+                               {
+                                       FF(avio_open2(
+                                               &oc_->pb, 
+                                               path_.string().c_str(), 
+                                               AVIO_FLAG_WRITE, 
+                                               &oc_->interrupt_callback, 
+                                               &av_opts));
+                               }
+                               
+                               FF(avformat_write_header(
+                                       oc_.get(), 
+                                       &av_opts));
+                               
+                               options_ = to_map(av_opts);
+                       }
+
+                       // Dump Info
+                       
+                       av_dump_format(
+                               oc_.get(), 
+                               0, 
+                               oc_->filename, 
+                               1);             
+
+                       for (const auto& option : options_)
+                       {
+                               CASPAR_LOG(warning) 
+                                       << L"Invalid option: -" 
+                                       << u16(option.first) 
+                                       << L" " 
+                                       << u16(option.second);
+                       }
+               }
+               catch(...)
+               {
+                       video_st_.reset();
+                       audio_st_.reset();
+                       oc_.reset();
+                       throw;
+               }
+       }
+
+       core::monitor::subject& monitor_output() override
+       {
+               return subject_;
+       }
+
+       std::wstring name() const override
+       {
+               return L"streaming";
+       }
+
+       std::future<bool> send(core::const_frame frame) override
+       {               
+               CASPAR_VERIFY(in_video_format_.format != core::video_format::invalid);
+               
+               --tokens_;
+               std::shared_ptr<void> token(
+                       nullptr, 
+                       [this](void*)
+                       {
+                               ++tokens_;
+                               tokens_cond_.notify_one();
+                       });
+
+               return executor_.begin_invoke([=]() -> bool
+               {
+                       boost::unique_lock<boost::mutex> tokens_lock(tokens_mutex_);
+
+                       while(tokens_ < 0)
+                               tokens_cond_.wait(tokens_lock);
+
+                       video_encoder_executor_.begin_invoke([=]() mutable
+                       {
+                               encode_video(
+                                       frame, 
+                                       token);
+                       });
+               
+                       audio_encoder_executor_.begin_invoke([=]() mutable
+                       {
+                               encode_audio(
+                                       frame, 
+                                       token);
+                       });
+                               
+                       return true;
+               });
+       }
+
+       std::wstring print() const override
+       {
+               return L"streaming_consumer[" + u16(path_.string()) + L"]";
+       }
+       
+       virtual boost::property_tree::wptree info() const override
+       {
+               return boost::property_tree::wptree();
+       }
+
+       bool has_synchronization_clock() const override
+       {
+               return false;
+       }
+
+       int buffer_depth() const override
+       {
+               return -1;
+       }
+
+       int index() const override
+       {
+               return 100000 + consumer_index_offset_;
+       }
+
+private:
+
+       static int interrupt_cb(void* ctx)
+       {
+               CASPAR_ASSERT(ctx);
+               return reinterpret_cast<streaming_consumer*>(ctx)->abort_request_;              
+       }
+               
+       std::shared_ptr<AVStream> open_encoder(
+                       const AVCodec& codec,
+                       std::map<std::string,
+                       std::string>& options)
+       {                       
+               auto st = 
+                       avformat_new_stream(
+                               oc_.get(), 
+                               &codec);
+
+               if (!st)                
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Could not allocate video-stream.") << boost::errinfo_api_function("av_new_stream"));      
+
+               auto enc = st->codec;
+                               
+               CASPAR_VERIFY(enc);
+                                               
+               switch(enc->codec_type)
+               {
+                       case AVMEDIA_TYPE_VIDEO:
+                       {                               
+                               enc->time_base                    = video_graph_out_->inputs[0]->time_base;
+                               enc->pix_fmt                      = static_cast<AVPixelFormat>(video_graph_out_->inputs[0]->format);
+                               enc->sample_aspect_ratio  = st->sample_aspect_ratio = video_graph_out_->inputs[0]->sample_aspect_ratio;
+                               enc->width                                = video_graph_out_->inputs[0]->w;
+                               enc->height                               = video_graph_out_->inputs[0]->h;
+                       
+                               break;
+                       }
+                       case AVMEDIA_TYPE_AUDIO:
+                       {
+                               enc->time_base                    = audio_graph_out_->inputs[0]->time_base;
+                               enc->sample_fmt                   = static_cast<AVSampleFormat>(audio_graph_out_->inputs[0]->format);
+                               enc->sample_rate                  = audio_graph_out_->inputs[0]->sample_rate;
+                               enc->channel_layout               = audio_graph_out_->inputs[0]->channel_layout;
+                               enc->channels                     = audio_graph_out_->inputs[0]->channels;
+                       
+                               break;
+                       }
+               }
+                                                                               
+               if(oc_->oformat->flags & AVFMT_GLOBALHEADER)
+                       enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
+               
+               static const std::array<std::string, 4> char_id_map = {{"v", "a", "d", "s"}};
+
+               const auto char_id = char_id_map.at(enc->codec_type);
+                                                               
+               const auto codec_opts = 
+                       remove_options(
+                               options, 
+                               boost::regex("^(" + char_id + "?[^:]+):" + char_id + "$"));
+               
+               AVDictionary* av_codec_opts = nullptr;
+
+               to_dict(
+                       &av_codec_opts, 
+                       options);
+
+               to_dict(
+                       &av_codec_opts,
+                       codec_opts);
+
+               options.clear();
+               
+               FF(avcodec_open2(
+                       enc,            
+                       &codec, 
+                       av_codec_opts ? &av_codec_opts : nullptr));             
+
+               if(av_codec_opts)
+               {
+                       auto t = 
+                               av_dict_get(
+                                       av_codec_opts, 
+                                       "", 
+                                        nullptr, 
+                                       AV_DICT_IGNORE_SUFFIX);
+
+                       while(t)
+                       {
+                               options[t->key + (codec_opts.find(t->key) != codec_opts.end() ? ":" + char_id : "")] = t->value;
+
+                               t = av_dict_get(
+                                               av_codec_opts, 
+                                               "", 
+                                               t, 
+                                               AV_DICT_IGNORE_SUFFIX);
+                       }
+
+                       av_dict_free(&av_codec_opts);
+               }
+                               
+               if(enc->codec_type == AVMEDIA_TYPE_AUDIO && !(codec.capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
+               {
+                       CASPAR_ASSERT(enc->frame_size > 0);
+                       av_buffersink_set_frame_size(audio_graph_out_, 
+                                                                                enc->frame_size);
+               }
+               
+               return std::shared_ptr<AVStream>(st, [this](AVStream* st)
+               {
+                       avcodec_close(st->codec);
+               });
+       }
+
+       void configue_audio_bistream_filters(
+                       std::map<std::string, std::string>& options)
+       {
+               const auto audio_bitstream_filter_str = 
+                       try_remove_arg<std::string>(
+                               options, 
+                               boost::regex("^bsf:a|absf$"));
+
+               const auto audio_bitstream_filter = 
+                       audio_bitstream_filter_str 
+                               ? av_bitstream_filter_init(audio_bitstream_filter_str->c_str()) 
+                               : nullptr;
+
+               CASPAR_VERIFY(!audio_bitstream_filter_str || audio_bitstream_filter);
+
+               if(audio_bitstream_filter)
+               {
+                       audio_bitstream_filter_.reset(
+                               audio_bitstream_filter, 
+                               av_bitstream_filter_close);
+               }
+               
+               if(audio_bitstream_filter_str && !audio_bitstream_filter_)
+                       options["bsf:a"] = *audio_bitstream_filter_str;
+       }
+       
+       void configue_video_bistream_filters(
+                       std::map<std::string, std::string>& options)
+       {
+               const auto video_bitstream_filter_str = 
+                               try_remove_arg<std::string>(
+                                       options, 
+                                       boost::regex("^bsf:v|vbsf$"));
+
+               const auto video_bitstream_filter = 
+                       video_bitstream_filter_str 
+                               ? av_bitstream_filter_init(video_bitstream_filter_str->c_str()) 
+                               : nullptr;
+
+               CASPAR_VERIFY(!video_bitstream_filter_str || video_bitstream_filter);
+
+               if(video_bitstream_filter)
+               {
+                       video_bitstream_filter_.reset(
+                               video_bitstream_filter, 
+                               av_bitstream_filter_close);
+               }
+               
+               if(video_bitstream_filter_str && !video_bitstream_filter_)
+                       options["bsf:v"] = *video_bitstream_filter_str;
+       }
+       
+       void configure_video_filters(
+                       const AVCodec& codec,
+                       const std::string& filtergraph)
+       {
+               video_graph_.reset(
+                               avfilter_graph_alloc(), 
+                               [](AVFilterGraph* p)
+                               {
+                                       avfilter_graph_free(&p);
+                               });
+               
+               video_graph_->nb_threads  = boost::thread::hardware_concurrency()/2;
+               video_graph_->thread_type = AVFILTER_THREAD_SLICE;
+
+               const auto sample_aspect_ratio =
+                       boost::rational<int>(
+                                       in_video_format_.square_width,
+                                       in_video_format_.square_height) /
+                       boost::rational<int>(
+                                       in_video_format_.width,
+                                       in_video_format_.height);
+               
+               const auto vsrc_options = (boost::format("video_size=%1%x%2%:pix_fmt=%3%:time_base=%4%/%5%:pixel_aspect=%6%/%7%:frame_rate=%8%/%9%")
+                       % in_video_format_.width % in_video_format_.height
+                       % AV_PIX_FMT_BGRA
+                       % in_video_format_.duration     % in_video_format_.time_scale
+                       % sample_aspect_ratio.numerator() % sample_aspect_ratio.denominator()
+                       % in_video_format_.time_scale % in_video_format_.duration).str();
+                                       
+               AVFilterContext* filt_vsrc = nullptr;                   
+               FF(avfilter_graph_create_filter(
+                               &filt_vsrc,
+                               avfilter_get_by_name("buffer"), 
+                               "ffmpeg_consumer_buffer",
+                               vsrc_options.c_str(), 
+                               nullptr, 
+                               video_graph_.get()));
+                               
+               AVFilterContext* filt_vsink = nullptr;
+               FF(avfilter_graph_create_filter(
+                               &filt_vsink,
+                               avfilter_get_by_name("buffersink"), 
+                               "ffmpeg_consumer_buffersink",
+                               nullptr, 
+                               nullptr, 
+                               video_graph_.get()));
+               
+#pragma warning (push)
+#pragma warning (disable : 4245)
+
+               FF(av_opt_set_int_list(
+                               filt_vsink, 
+                               "pix_fmts", 
+                               codec.pix_fmts, 
+                               -1,
+                               AV_OPT_SEARCH_CHILDREN));
+
+#pragma warning (pop)
+                       
+               configure_filtergraph(
+                               *video_graph_, 
+                               filtergraph,
+                               *filt_vsrc,
+                               *filt_vsink);
+
+               video_graph_in_  = filt_vsrc;
+               video_graph_out_ = filt_vsink;
+               
+               CASPAR_LOG(info)
+                       <<      u16(std::string("\n") 
+                               + avfilter_graph_dump(
+                                               video_graph_.get(), 
+                                               nullptr));
+       }
+
+       void configure_audio_filters(
+                       const AVCodec& codec,
+                       const std::string& filtergraph)
+       {
+               audio_graph_.reset(
+                       avfilter_graph_alloc(), 
+                       [](AVFilterGraph* p)
+                       {
+                               avfilter_graph_free(&p);
+                       });
+               
+               audio_graph_->nb_threads  = boost::thread::hardware_concurrency()/2;
+               audio_graph_->thread_type = AVFILTER_THREAD_SLICE;
+               
+               const auto asrc_options = (boost::format("sample_rate=%1%:sample_fmt=%2%:channels=%3%:time_base=%4%/%5%:channel_layout=%6%")
+                       % in_video_format_.audio_sample_rate
+                       % av_get_sample_fmt_name(AV_SAMPLE_FMT_S32)
+                       % in_video_format_.audio_channels
+                       % 1     % in_video_format_.audio_sample_rate
+                       % boost::io::group(
+                               std::hex, 
+                               std::showbase, 
+                               av_get_default_channel_layout(in_video_format_.audio_channels))).str();
+
+               AVFilterContext* filt_asrc = nullptr;
+               FF(avfilter_graph_create_filter(
+                       &filt_asrc,
+                       avfilter_get_by_name("abuffer"), 
+                       "ffmpeg_consumer_abuffer",
+                       asrc_options.c_str(), 
+                       nullptr, 
+                       audio_graph_.get()));
+                               
+               AVFilterContext* filt_asink = nullptr;
+               FF(avfilter_graph_create_filter(
+                       &filt_asink,
+                       avfilter_get_by_name("abuffersink"), 
+                       "ffmpeg_consumer_abuffersink",
+                       nullptr, 
+                       nullptr, 
+                       audio_graph_.get()));
+               
+#pragma warning (push)
+#pragma warning (disable : 4245)
+
+               FF(av_opt_set_int(
+                       filt_asink,        
+                       "all_channel_counts",
+                       1,      
+                       AV_OPT_SEARCH_CHILDREN));
+
+               FF(av_opt_set_int_list(
+                       filt_asink, 
+                       "sample_fmts",           
+                       codec.sample_fmts,                              
+                       -1, 
+                       AV_OPT_SEARCH_CHILDREN));
+
+               FF(av_opt_set_int_list(
+                       filt_asink,
+                       "channel_layouts",       
+                       codec.channel_layouts,                  
+                       -1, 
+                       AV_OPT_SEARCH_CHILDREN));
+
+               FF(av_opt_set_int_list(
+                       filt_asink, 
+                       "sample_rates" ,         
+                       codec.supported_samplerates,    
+                       -1, 
+                       AV_OPT_SEARCH_CHILDREN));
+
+#pragma warning (pop)
+                       
+               configure_filtergraph(
+                       *audio_graph_, 
+                       filtergraph, 
+                       *filt_asrc, 
+                       *filt_asink);
+
+               audio_graph_in_  = filt_asrc;
+               audio_graph_out_ = filt_asink;
+
+               CASPAR_LOG(info) 
+                       <<      u16(std::string("\n") 
+                               + avfilter_graph_dump(
+                                       audio_graph_.get(), 
+                                       nullptr));
+       }
+
+       void configure_filtergraph(
+                       AVFilterGraph& graph,
+                       const std::string& filtergraph,
+                       AVFilterContext& source_ctx,
+                       AVFilterContext& sink_ctx)
+       {
+               AVFilterInOut* outputs = nullptr;
+               AVFilterInOut* inputs = nullptr;
+
+               try
+               {
+                       if(!filtergraph.empty())
+                       {
+                               outputs = avfilter_inout_alloc();
+                               inputs  = avfilter_inout_alloc();
+
+                               CASPAR_VERIFY(outputs && inputs);
+
+                               outputs->name       = av_strdup("in");
+                               outputs->filter_ctx = &source_ctx;
+                               outputs->pad_idx    = 0;
+                               outputs->next       = nullptr;
+
+                               inputs->name        = av_strdup("out");
+                               inputs->filter_ctx  = &sink_ctx;
+                               inputs->pad_idx     = 0;
+                               inputs->next        = nullptr;
+
+                               FF(avfilter_graph_parse(
+                                       &graph, 
+                                       filtergraph.c_str(), 
+                                       &inputs, 
+                                       &outputs, 
+                                       nullptr));
+                       } 
+                       else 
+                       {
+                               FF(avfilter_link(
+                                       &source_ctx, 
+                                       0, 
+                                       &sink_ctx, 
+                                       0));
+                       }
+
+                       FF(avfilter_graph_config(
+                               &graph, 
+                               nullptr));
+               }
+               catch(...)
+               {
+                       avfilter_inout_free(&outputs);
+                       avfilter_inout_free(&inputs);
+                       throw;
+               }
+       }
+       
+       void encode_video(core::const_frame frame_ptr, std::shared_ptr<void> token)
+       {               
+               if(!video_st_)
+                       return;
+
+               auto enc = video_st_->codec;
+                       
+               std::shared_ptr<AVFrame> src_av_frame;
+
+               if(frame_ptr != core::const_frame::empty())
+               {
+                       src_av_frame.reset(
+                               av_frame_alloc(),
+                               [frame_ptr](AVFrame* frame)
+                               {
+                                       av_frame_free(&frame);
+                               });
+
+                       avcodec_get_frame_defaults(src_av_frame.get());         
+                       
+                       const auto sample_aspect_ratio = 
+                               boost::rational<int>(
+                                       in_video_format_.square_width, 
+                                       in_video_format_.square_height) /
+                               boost::rational<int>(
+                                       in_video_format_.width, 
+                                       in_video_format_.height);
+
+                       src_av_frame->format                              = AV_PIX_FMT_BGRA;
+                       src_av_frame->width                                       = in_video_format_.width;
+                       src_av_frame->height                              = in_video_format_.height;
+                       src_av_frame->sample_aspect_ratio.num = sample_aspect_ratio.numerator();
+                       src_av_frame->sample_aspect_ratio.den = sample_aspect_ratio.denominator();
+                       src_av_frame->pts                                         = video_pts_;
+
+                       video_pts_ += 1;
+
+                       FF(av_image_fill_arrays(
+                               src_av_frame->data,
+                               src_av_frame->linesize,
+                               frame_ptr.image_data().begin(),
+                               static_cast<AVPixelFormat>(src_av_frame->format), 
+                               in_video_format_.width, 
+                               in_video_format_.height, 
+                               1));
+
+                       FF(av_buffersrc_add_frame(
+                               video_graph_in_, 
+                               src_av_frame.get()));
+               }               
+
+               int ret = 0;
+
+               while(ret >= 0)
+               {
+                       std::shared_ptr<AVFrame> filt_frame(
+                               av_frame_alloc(), 
+                               [](AVFrame* p)
+                               {
+                                       av_frame_free(&p);
+                               });
+
+                       ret = av_buffersink_get_frame(
+                               video_graph_out_, 
+                               filt_frame.get());
+                                               
+                       video_encoder_executor_.begin_invoke([=]
+                       {
+                               if(ret == AVERROR_EOF)
+                               {
+                                       if(enc->codec->capabilities & CODEC_CAP_DELAY)
+                                       {
+                                               while(encode_av_frame(
+                                                               *video_st_, 
+                                                               video_bitstream_filter_.get(),
+                                                               avcodec_encode_video2, 
+                                                               nullptr, token))
+                                               {
+                                                       boost::this_thread::yield(); // TODO:
+                                               }
+                                       }               
+                               }
+                               else if(ret != AVERROR(EAGAIN))
+                               {
+                                       FF_RET(ret, "av_buffersink_get_frame");
+                                       
+                                       if (filt_frame->interlaced_frame) 
+                                       {
+                                               if (enc->codec->id == AV_CODEC_ID_MJPEG)
+                                                       enc->field_order = filt_frame->top_field_first ? AV_FIELD_TT : AV_FIELD_BB;
+                                               else
+                                                       enc->field_order = filt_frame->top_field_first ? AV_FIELD_TB : AV_FIELD_BT;
+                                       } 
+                                       else
+                                               enc->field_order = AV_FIELD_PROGRESSIVE;
+
+                                       filt_frame->quality = enc->global_quality;
+
+                                       if (!enc->me_threshold)
+                                               filt_frame->pict_type = AV_PICTURE_TYPE_NONE;
+                       
+                                       encode_av_frame(
+                                               *video_st_,
+                                               video_bitstream_filter_.get(),
+                                               avcodec_encode_video2,
+                                               filt_frame, 
+                                               token);
+
+                                       boost::this_thread::yield(); // TODO:
+                               }
+                       });
+               }
+       }
+                                       
+       void encode_audio(core::const_frame frame_ptr, std::shared_ptr<void> token)
+       {               
+               if(!audio_st_)
+                       return;
+               
+               auto enc = audio_st_->codec;
+                       
+               std::shared_ptr<AVFrame> src_av_frame;
+
+               if(frame_ptr != core::const_frame::empty())
+               {
+                       src_av_frame.reset(
+                               av_frame_alloc(), 
+                               [](AVFrame* p)
+                               {
+                                       av_frame_free(&p);
+                               });
+               
+                       src_av_frame->channels           = in_video_format_.audio_channels;
+                       src_av_frame->channel_layout = av_get_default_channel_layout(in_video_format_.audio_channels);
+                       src_av_frame->sample_rate        = in_video_format_.audio_sample_rate;
+                       src_av_frame->nb_samples         = static_cast<int>(frame_ptr.audio_data().size()) / src_av_frame->channels;
+                       src_av_frame->format             = AV_SAMPLE_FMT_S32;
+                       src_av_frame->pts                        = audio_pts_;
+
+                       audio_pts_ += src_av_frame->nb_samples;
+
+                       FF(av_samples_fill_arrays(
+                                       src_av_frame->extended_data,
+                                       src_av_frame->linesize,
+                                       reinterpret_cast<const std::uint8_t*>(&*frame_ptr.audio_data().begin()),
+                                       src_av_frame->channels,
+                                       src_av_frame->nb_samples,
+                                       static_cast<AVSampleFormat>(src_av_frame->format),
+                                       16));
+               
+                       FF(av_buffersrc_add_frame(
+                                       audio_graph_in_, 
+                                       src_av_frame.get()));
+               }
+
+               int ret = 0;
+
+               while(ret >= 0)
+               {
+                       std::shared_ptr<AVFrame> filt_frame(
+                               av_frame_alloc(), 
+                               [](AVFrame* p)
+                               {
+                                       av_frame_free(&p);
+                               });
+
+                       ret = av_buffersink_get_frame(
+                               audio_graph_out_, 
+                               filt_frame.get());
+                                       
+                       audio_encoder_executor_.begin_invoke([=]
+                       {       
+                               if(ret == AVERROR_EOF)
+                               {
+                                       if(enc->codec->capabilities & CODEC_CAP_DELAY)
+                                       {
+                                               while(encode_av_frame(
+                                                               *audio_st_, 
+                                                               audio_bitstream_filter_.get(), 
+                                                               avcodec_encode_audio2, 
+                                                               nullptr, 
+                                                               token))
+                                               {
+                                                       boost::this_thread::yield(); // TODO:
+                                               }
+                                       }
+                               }
+                               else if(ret != AVERROR(EAGAIN))
+                               {
+                                       FF_RET(
+                                               ret, 
+                                               "av_buffersink_get_frame");
+
+                                       encode_av_frame(
+                                               *audio_st_, 
+                                               audio_bitstream_filter_.get(), 
+                                               avcodec_encode_audio2, 
+                                               filt_frame, 
+                                               token);
+
+                                       boost::this_thread::yield(); // TODO:
+                               }
+                       });
+               }
+       }
+       
+       template<typename F>
+       bool encode_av_frame(
+                       AVStream& st,
+                       AVBitStreamFilterContext* bsfc, 
+                       const F& func, 
+                       const std::shared_ptr<AVFrame>& src_av_frame, 
+                       std::shared_ptr<void> token)
+       {
+               AVPacket pkt = {};
+               av_init_packet(&pkt);
+
+               int got_packet = 0;
+
+               FF(func(
+                       st.codec, 
+                       &pkt, 
+                       src_av_frame.get(), 
+                       &got_packet));
+                                       
+               if(!got_packet || pkt.size <= 0)
+                       return false;
+                               
+               pkt.stream_index = st.index;
+               
+               if(bsfc)
+               {
+                       auto new_pkt = pkt;
+
+                       auto a = av_bitstream_filter_filter(
+                                       bsfc,
+                                       st.codec,
+                                       nullptr,
+                                       &new_pkt.data,
+                                       &new_pkt.size,
+                                       pkt.data,
+                                       pkt.size,
+                                       pkt.flags & AV_PKT_FLAG_KEY);
+
+                       if(a == 0 && new_pkt.data != pkt.data && new_pkt.destruct) 
+                       {
+                               auto t = reinterpret_cast<std::uint8_t*>(av_malloc(new_pkt.size + FF_INPUT_BUFFER_PADDING_SIZE));
+
+                               if(t) 
+                               {
+                                       memcpy(
+                                               t, 
+                                               new_pkt.data,
+                                               new_pkt.size);
+
+                                       memset(
+                                               t + new_pkt.size, 
+                                               0, 
+                                               FF_INPUT_BUFFER_PADDING_SIZE);
+
+                                       new_pkt.data = t;
+                                       new_pkt.buf  = nullptr;
+                               } 
+                               else
+                                       a = AVERROR(ENOMEM);
+                       }
+
+                       av_free_packet(&pkt);
+
+                       FF_RET(
+                               a, 
+                               "av_bitstream_filter_filter");
+
+                       new_pkt.buf =
+                               av_buffer_create(
+                                       new_pkt.data, 
+                                       new_pkt.size,
+                                       av_buffer_default_free, 
+                                       nullptr, 
+                                       0);
+
+                       CASPAR_VERIFY(new_pkt.buf);
+
+                       pkt = new_pkt;
+               }
+               
+               if (pkt.pts != AV_NOPTS_VALUE)
+               {
+                       pkt.pts = 
+                               av_rescale_q(
+                                       pkt.pts,
+                                       st.codec->time_base, 
+                                       st.time_base);
+               }
+
+               if (pkt.dts != AV_NOPTS_VALUE)
+               {
+                       pkt.dts = 
+                               av_rescale_q(
+                                       pkt.dts, 
+                                       st.codec->time_base, 
+                                       st.time_base);
+               }
+                               
+               pkt.duration = 
+                       static_cast<int>(
+                               av_rescale_q(
+                                       pkt.duration, 
+                                       st.codec->time_base, st.time_base));
+
+               write_packet(
+                       std::shared_ptr<AVPacket>(
+                               new AVPacket(pkt), 
+                               [](AVPacket* p)
+                               {
+                                       av_free_packet(p); 
+                                       delete p;
+                               }), token);
+
+               return true;
+       }
+
+       void write_packet(
+                       const std::shared_ptr<AVPacket>& pkt_ptr,
+                       std::shared_ptr<void> token)
+       {               
+               write_executor_.begin_invoke([this, pkt_ptr, token]() mutable
+               {
+                       FF(av_interleaved_write_frame(
+                               oc_.get(), 
+                               pkt_ptr.get()));
+               });     
+       }       
+       
+       template<typename T>
+       static boost::optional<T> try_remove_arg(
+                       std::map<std::string, std::string>& options, 
+                       const boost::regex& expr)
+       {
+               for(auto it = options.begin(); it != options.end(); ++it)
+               {                       
+                       if(boost::regex_search(it->first, expr))
+                       {
+                               auto arg = it->second;
+                               options.erase(it);
+                               return boost::lexical_cast<T>(arg);
+                       }
+               }
+
+               return boost::optional<T>();
+       }
+               
+       static std::map<std::string, std::string> remove_options(
+                       std::map<std::string, std::string>& options, 
+                       const boost::regex& expr)
+       {
+               std::map<std::string, std::string> result;
+                       
+               auto it = options.begin();
+               while(it != options.end())
+               {                       
+                       boost::smatch what;
+                       if(boost::regex_search(it->first, what, expr))
+                       {
+                               result[
+                                       what.size() > 0 && what[1].matched 
+                                               ? what[1].str() 
+                                               : it->first] = it->second;
+                               it = options.erase(it);
+                       }
+                       else
+                               ++it;
+               }
+
+               return result;
+       }
+               
+       static void to_dict(AVDictionary** dest, const std::map<std::string, std::string>& c)
+       {               
+               for (const auto& entry : c)
+               {
+                       av_dict_set(
+                               dest, 
+                               entry.first.c_str(), 
+                               entry.second.c_str(), 0);
+               }
+       }
+
+       static std::map<std::string, std::string> to_map(AVDictionary* dict)
+       {
+               std::map<std::string, std::string> result;
+               
+               for(auto t = dict 
+                               ? av_dict_get(
+                                       dict, 
+                                       "", 
+                                       nullptr, 
+                                       AV_DICT_IGNORE_SUFFIX) 
+                               : nullptr;
+                       t; 
+                       t = av_dict_get(
+                               dict, 
+                               "", 
+                               t,
+                               AV_DICT_IGNORE_SUFFIX))
+               {
+                       result[t->key] = t->value;
+               }
+
+               return result;
+       }
+};
+       
+spl::shared_ptr<core::frame_consumer> create_streaming_consumer(
+               const std::vector<std::wstring>& params, core::interaction_sink*)
+{       
+       if (params.size() < 1 || params.at(0) != L"STREAM")
+               return core::frame_consumer::empty();
+
+       auto path = u8(params.at(1));
+       auto args = u8(boost::join(params, L" "));
+
+       return spl::make_shared<streaming_consumer>(path, args);
+}
+
+spl::shared_ptr<core::frame_consumer> create_preconfigured_streaming_consumer(
+               const boost::property_tree::wptree& ptree, core::interaction_sink*)
+{                      
+       return spl::make_shared<streaming_consumer>(
+                       u8(ptree.get<std::wstring>(L"path")), 
+                       u8(ptree.get<std::wstring>(L"args", L"")));
+}
+
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/consumer/streaming_consumer.h b/modules/ffmpeg/consumer/streaming_consumer.h
new file mode 100644 (file)
index 0000000..0733ab8
--- /dev/null
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <common/memory.h>
+
+#include <core/fwd.h>
+
+#include <boost/property_tree/ptree_fwd.hpp>
+
+#include <string>
+#include <vector>
+
+namespace caspar { namespace ffmpeg {
+       
+spl::shared_ptr<core::frame_consumer> create_streaming_consumer(
+               const std::vector<std::wstring>& params, core::interaction_sink*);
+spl::shared_ptr<core::frame_consumer> create_preconfigured_streaming_consumer(
+               const boost::property_tree::wptree& ptree, core::interaction_sink*);
+
+}}
\ No newline at end of file
index a29d9395ded7ec90cc3950a8464acb3f2a29f5ae..f97705d825f7dab59ff130818fdf245449c08834 100644 (file)
@@ -24,6 +24,7 @@
 #include "ffmpeg.h"
 
 #include "consumer/ffmpeg_consumer.h"
+#include "consumer/streaming_consumer.h"
 #include "producer/ffmpeg_producer.h"
 #include "producer/util/util.h"
 
@@ -247,7 +248,9 @@ void init(core::module_dependencies dependencies)
     avcodec_register_all();
        
        core::register_consumer_factory(create_consumer);
+       core::register_consumer_factory(create_streaming_consumer);
        core::register_preconfigured_consumer_factory(L"file", create_preconfigured_consumer);
+       core::register_preconfigured_consumer_factory(L"stream", create_preconfigured_streaming_consumer);
        core::register_producer_factory(create_producer);
        
        dependencies.media_info_repo->register_extractor(
diff --git a/modules/ffmpeg/util/error.cpp b/modules/ffmpeg/util/error.cpp
new file mode 100644 (file)
index 0000000..1327626
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+* Copyright (c) 2012 Robert Nagy <ronag89@gmail.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+#include "../StdAfx.h"
+
+#include "error.h"
+
+#include <common/utf.h>
+
+#pragma warning(disable: 4146)
+
+#pragma warning(push)
+#pragma warning(disable: 4244)
+
+extern "C" 
+{
+       #include <libavutil/common.h>
+       #include <libavutil/error.h>
+}
+
+#pragma warning(pop)
+
+namespace caspar { namespace ffmpeg {
+       
+std::string av_error_str(int errn)
+{
+       char buf[256];
+       memset(buf, 0, 256);
+       if(av_strerror(errn, buf, 256) < 0)
+               return "";
+       return std::string(buf);
+}
+
+void throw_on_ffmpeg_error(int ret, const char* source, const char* func, const char* local_func, const char* file, int line)
+{
+       if(ret >= 0)
+               return;
+
+       switch(ret)
+       {
+       case AVERROR_BSF_NOT_FOUND:
+               ::boost::exception_detail::throw_exception_(averror_bsf_not_found()<<                                                                           
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);  
+       case AVERROR_DECODER_NOT_FOUND:
+               ::boost::exception_detail::throw_exception_(averror_decoder_not_found()<<                                                                               
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_DEMUXER_NOT_FOUND:
+               ::boost::exception_detail::throw_exception_(averror_demuxer_not_found()<<                                                                               
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_ENCODER_NOT_FOUND:
+               ::boost::exception_detail::throw_exception_(averror_encoder_not_found()<<                                                                               
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);  
+       case AVERROR_EOF:       
+               ::boost::exception_detail::throw_exception_(averror_eof()<<                                                                             
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_EXIT:                              
+               ::boost::exception_detail::throw_exception_(averror_exit()<<                                                                            
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_FILTER_NOT_FOUND:                          
+               ::boost::exception_detail::throw_exception_(averror_filter_not_found()<<                                                                                
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_MUXER_NOT_FOUND:   
+               ::boost::exception_detail::throw_exception_(averror_muxer_not_found()<<                                                                         
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_OPTION_NOT_FOUND:  
+               ::boost::exception_detail::throw_exception_(averror_option_not_found()<<                                                                                
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_PATCHWELCOME:      
+               ::boost::exception_detail::throw_exception_(averror_patchwelcome()<<                                                                            
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_PROTOCOL_NOT_FOUND:        
+               ::boost::exception_detail::throw_exception_(averror_protocol_not_found()<<                                                                              
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       case AVERROR_STREAM_NOT_FOUND:
+               ::boost::exception_detail::throw_exception_(averror_stream_not_found()<<                                                                                
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       default:
+               ::boost::exception_detail::throw_exception_(ffmpeg_error()<<                                                                            
+                       msg_info(av_error_str(ret)) <<                                                  
+                       source_info(source) <<                                          
+                       boost::errinfo_api_function(func) <<                                    
+                       boost::errinfo_errno(AVUNERROR(ret)), local_func, file, line);
+       }
+}
+
+void throw_on_ffmpeg_error(int ret, const std::wstring& source, const char* func, const char* local_func, const char* file, int line)
+{
+       throw_on_ffmpeg_error(ret, u8(source).c_str(), func, local_func, file, line);
+}
+
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/util/error.h b/modules/ffmpeg/util/error.h
new file mode 100644 (file)
index 0000000..d432c82
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+* Copyright (c) 2012 Robert Nagy <ronag89@gmail.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+#pragma once
+
+#include <common/except.h>
+
+#include <cstdint>
+#include <string>
+
+namespace caspar { namespace ffmpeg {
+
+struct ffmpeg_error : virtual caspar_exception{};
+struct averror_bsf_not_found : virtual ffmpeg_error{};
+struct averror_decoder_not_found : virtual ffmpeg_error{};
+struct averror_demuxer_not_found : virtual ffmpeg_error{};
+struct averror_encoder_not_found : virtual ffmpeg_error{};
+struct averror_eof : virtual ffmpeg_error{};
+struct averror_exit : virtual ffmpeg_error{};
+struct averror_filter_not_found : virtual ffmpeg_error{};
+struct averror_muxer_not_found : virtual ffmpeg_error{};
+struct averror_option_not_found : virtual ffmpeg_error{};
+struct averror_patchwelcome : virtual ffmpeg_error{};
+struct averror_protocol_not_found : virtual ffmpeg_error{};
+struct averror_stream_not_found : virtual ffmpeg_error{};
+
+std::string av_error_str(int errn);
+
+void throw_on_ffmpeg_error(int ret, const char* source, const char* func, const char* local_func, const char* file, int line);
+void throw_on_ffmpeg_error(int ret, const std::wstring& source, const char* func, const char* local_func, const char* file, int line);
+
+
+//#define THROW_ON_ERROR(ret, source, func) throw_on_ffmpeg_error(ret, source, __FUNC__, __FILE__, __LINE__)
+
+#define THROW_ON_ERROR_STR_(call) #call
+#define THROW_ON_ERROR_STR(call) THROW_ON_ERROR_STR_(call)
+
+#define FF_RET(ret, func) \
+               caspar::ffmpeg::throw_on_ffmpeg_error(ret, L"", func, __FUNCTION__, __FILE__, __LINE__);                
+
+#define FF(call)                                                                               \
+       [&]() -> int                                                                                                            \
+       {                                                                                                                                               \
+               auto ret = call;                                                                                                                \
+               caspar::ffmpeg::throw_on_ffmpeg_error(static_cast<int>(ret), L"", THROW_ON_ERROR_STR(call), __FUNCTION__, __FILE__, __LINE__);  \
+               return ret;                                                                                                                     \
+       }()
+
+#define LOG_ON_ERROR2(call)                                                                                    \
+       [&]() -> std::int64_t                                                                                                                   \
+       {                                       \
+               auto ret = -1;\
+               try{                                                                                                                            \
+               ret = static_cast<int>(call);                                                                                                                   \
+               caspar::ffmpeg::throw_on_ffmpeg_error(ret, L"", THROW_ON_ERROR_STR(call), __FUNCTION__, __FILE__, __LINE__);    \
+               return ret;                                                                                                                     \
+               }catch(...){CASPAR_LOG_CURRENT_EXCEPTION();}                                            \
+               return ret;                                                                                                                     \
+       }()
+
+}}
index e648e70457b5fd1e26da74255243347a12fd568c..0a11c106076fbc3fb631cc22c41cb3db277b0902 100644 (file)
@@ -169,7 +169,7 @@ spl::shared_ptr<core::frame_producer> create_ct_producer(
 
        auto flash_producer = flash::create_producer(frame_factory, format_desc, {});
        auto producer = flash_producer;
-       flash_cg_proxy(producer, env::media_folder()).add(0, params[0], true, L"", L"");
+       flash_cg_proxy(producer, env::media_folder()).add(0, params.at(0), true, L"", L"");
 
        return producer;
 }
index 89cffa553fa3e2382220185c279e71910f833d3c..2e91603615f7e8b0a28461f21e7a2031dc154047 100644 (file)
@@ -34,6 +34,7 @@
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include <tbb/concurrent_queue.h>
 
@@ -151,13 +152,13 @@ public:
 
 spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params, core::interaction_sink*)
 {
-       if (params.size() < 1 || params[0] != L"IMAGE")
+       if (params.size() < 1 || !boost::iequals(params.at(0), L"IMAGE"))
                return core::frame_consumer::empty();
 
        std::wstring filename;
 
        if (params.size() > 1)
-               filename = params[1];
+               filename = params.at(1);
 
        return spl::make_shared<image_consumer>(filename);
 }
index 2f9851e1d257edfd5aebe7b2aa8a8680b2562111..f46db914d771f88c1ed301c7a232edbb1b735166 100644 (file)
@@ -186,13 +186,13 @@ spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core
                L".j2c"
        };
 
-       if (boost::iequals(params[0], L"[IMG_SEQUENCE]"))
+       if (boost::iequals(params.at(0), L"[IMG_SEQUENCE]"))
        {
                if (params.size() != 2)
                        return core::frame_producer::empty();
 
-               auto dir = boost::filesystem::path(env::media_folder() + params[1]).parent_path();
-               auto basename = boost::filesystem::basename(params[1]);
+               auto dir = boost::filesystem::path(env::media_folder() + params.at(1)).parent_path();
+               auto basename = boost::filesystem::basename(params.at(1));
                std::set<std::wstring> files;
                boost::filesystem::directory_iterator end;
 
@@ -234,17 +234,17 @@ spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core
 
                return core::create_const_producer(std::move(frames), width, height);
        }
-       else if(boost::iequals(params[0], L"[PNG_BASE64]"))
+       else if(boost::iequals(params.at(0), L"[PNG_BASE64]"))
        {
                if (params.size() < 2)
                        return core::frame_producer::empty();
 
-               auto png_data = from_base64(std::string(params[1].begin(), params[1].end()));
+               auto png_data = from_base64(std::string(params.at(1).begin(), params.at(1).end()));
 
                return spl::make_shared<image_producer>(frame_factory, png_data.data(), png_data.size());
        }
 
-       std::wstring filename = env::media_folder() + params[0];
+       std::wstring filename = env::media_folder() + params.at(0);
 
        auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool
        {
index e9b7fcadb3e9e9b9197c2a3bbbd19cd72cfed88b..ffddbf9ba1e7a877702dfad62a170e4138cc2a91 100644 (file)
@@ -410,7 +410,7 @@ spl::shared_ptr<core::frame_producer> create_scroll_producer(const spl::shared_p
                L".j2k",
                L".j2c"
        };
-       std::wstring filename = env::media_folder() + params[0];
+       std::wstring filename = env::media_folder() + params.at(0);
        
        auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool
        {
index feb126efc3c491757993c24176508e30eeeea6ca..2735adb6d08e8644abfd69fa7b1a3b2e8f3a2690 100644 (file)
@@ -173,10 +173,10 @@ public:
 
 spl::shared_ptr<core::frame_consumer> create_ivga_consumer(const std::vector<std::wstring>& params, core::interaction_sink*)
 {
-       if(params.size() < 1 || params[0] != L"NEWTEK_IVGA")
+       if (params.size() < 1 || !boost::iequals(params.at(0), L"NEWTEK_IVGA"))
                return core::frame_consumer::empty();
 
-       const auto provide_sync = get_param(L"PROVIDE_SYNC", params, true);
+       const auto provide_sync = !contains_param(L"DONT_PROVIDE_SYNC", params);
 
        return spl::make_shared<newtek_ivga_consumer>(provide_sync);
 }
index 704f06d6a31a209dca2ffc520f584ca03a17cd56..f9d4aa8706f125d59fb9fb579b954ab7cd1a59b3 100644 (file)
@@ -40,6 +40,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/timer.hpp>
 #include <boost/thread/once.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include <tbb/concurrent_queue.h>
 
@@ -262,7 +263,7 @@ public:
 
 spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params, core::interaction_sink*)
 {
-       if(params.size() < 1 || params[0] != L"AUDIO")
+       if(params.size() < 1 || !boost::iequals(params.at(0), L"AUDIO"))
                return core::frame_consumer::empty();
 
        return spl::make_shared<oal_consumer>();
index 1ec096e406f6de8701d1bcfea147fe868484b309..36a6f8f06ca37d0f151af42b08bf5efcbd4f0b95 100644 (file)
@@ -347,7 +347,7 @@ void create_timelines(
 
 spl::shared_ptr<core::frame_producer> create_psd_scene_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params)
 {
-       std::wstring filename = env::template_folder() + params[0] + L".psd";
+       std::wstring filename = env::template_folder() + params.at(0) + L".psd";
        auto found_file = find_case_insensitive(filename);
 
        if (!found_file)
index d30e63e73b5b1470bfbae9903ccfd839245ffbb2..39e6b48bac76b3f2e5d0fd691371ad1779c5e230 100644 (file)
@@ -34,6 +34,7 @@
 #include <common/prec_timer.h>
 #include <common/future.h>
 #include <common/timer.h>
+#include <common/param.h>
 
 //#include <windows.h>
 
@@ -48,6 +49,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/thread.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include <tbb/atomic.h>
 #include <tbb/concurrent_queue.h>
@@ -646,21 +648,20 @@ public:
 
 spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params, core::interaction_sink* sink)
 {
-       if(params.size() < 1 || params[0] != L"SCREEN")
+       if (params.size() < 1 || !boost::iequals(params.at(0), L"SCREEN"))
                return core::frame_consumer::empty();
        
        configuration config;
                
-       if(params.size() > 1)
-               config.screen_index = boost::lexical_cast<int>(params[1]);
+       if (params.size() > 1)
+               config.screen_index = boost::lexical_cast<int>(params.at(1));
                
-       config.windowed         = std::find(params.begin(), params.end(), L"FULLSCREEN") == params.end();
-       config.key_only         = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end();
-       config.interactive      = std::find(params.begin(), params.end(), L"NON_INTERACTIVE") == params.end();
+       config.windowed         = !contains_param(L"FULLSCREEN", params);
+       config.key_only         =  contains_param(L"KEY_ONLY", params);
+       config.interactive      = !contains_param(L"NON_INTERACTIVE", params);
 
-       auto name_it    = std::find(params.begin(), params.end(), L"NAME");
-       if(name_it != params.end() && ++name_it != params.end())
-               config.name = *name_it;
+       if (contains_param(L"NAME", params))
+               config.name = get_param(L"NAME", params);
 
        return spl::make_shared<screen_consumer_proxy>(config, sink);
 }
@@ -669,10 +670,10 @@ spl::shared_ptr<core::frame_consumer> create_preconfigured_consumer(const boost:
 {
        configuration config;
        config.name                             = ptree.get(L"name",                            config.name);
-       config.screen_index             = ptree.get(L"device",                          config.screen_index+1)-1;
+       config.screen_index             = ptree.get(L"device",                          config.screen_index + 1) - 1;
        config.windowed                 = ptree.get(L"windowed",                        config.windowed);
-       config.key_only                 = ptree.get(L"key-only",                                config.key_only);
-       config.auto_deinterlace = ptree.get(L"auto-deinterlace",                config.auto_deinterlace);
+       config.key_only                 = ptree.get(L"key-only",                        config.key_only);
+       config.auto_deinterlace = ptree.get(L"auto-deinterlace",        config.auto_deinterlace);
        config.vsync                    = ptree.get(L"vsync",                           config.vsync);
        config.interactive              = ptree.get(L"interactive",                     config.interactive);
 
index 06b3c70886c1115150470d97a790fc0508d7c47a..4a62346576e1dd6923f7dbf1bf1f3c260706aeab 100644 (file)
@@ -880,11 +880,10 @@ bool AddCommand::DoExecute()
        //Perform loading of the clip
        try
        {
-               //create_consumer still expects all parameters to be uppercase
-               for (auto& str : parameters())
-               {
-                       boost::to_upper(str);
-               }
+               replace_placeholders(
+                               L"<CLIENT_IP_ADDRESS>",
+                               this->client()->address(),
+                               parameters());
 
                core::diagnostics::scoped_call_context save;
                core::diagnostics::call_context::for_thread().video_channel = channel_index() + 1;
@@ -918,11 +917,10 @@ bool RemoveCommand::DoExecute()
                auto index = layer_index(std::numeric_limits<int>::min());
                if(index == std::numeric_limits<int>::min())
                {
-                       //create_consumer still expects all parameters to be uppercase
-                       for (auto& str : parameters())
-                       {
-                               boost::to_upper(str);
-                       }
+                       replace_placeholders(
+                                       L"<CLIENT_IP_ADDRESS>",
+                                       this->client()->address(),
+                                       parameters());
 
                        index = create_consumer(parameters(), &channel()->stage())->index();
                }
index efca0e3f838585d0b98817e1152485d5c7ffbac9..386826d83561926ce1ecf11031b709c60b9c2388 100644 (file)
@@ -70,7 +70,7 @@ class connection : public spl::enable_shared_from_this<connection>
                explicit connection_holder(std::weak_ptr<connection> conn) : connection_(std::move(conn))
                {}
 
-               virtual void send(std::basic_string<char>&& data)
+               void send(std::basic_string<char>&& data) override
                {
                        auto conn = connection_.lock();
 
@@ -78,7 +78,7 @@ class connection : public spl::enable_shared_from_this<connection>
                                conn->send(std::move(data));
                }
 
-               virtual void disconnect()
+               void disconnect() override
                {
                        auto conn = connection_.lock();
 
@@ -86,7 +86,7 @@ class connection : public spl::enable_shared_from_this<connection>
                                conn->disconnect();
                }
 
-               virtual std::wstring print() const
+               std::wstring print() const override
                {
                        auto conn = connection_.lock();
 
@@ -96,14 +96,25 @@ class connection : public spl::enable_shared_from_this<connection>
                                return L"[destroyed-connection]";
                }
 
-               virtual void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound)
+               std::wstring address() const override
+               {
+                       auto conn = connection_.lock();
+
+                       if (conn)
+                               return conn->address();
+                       else
+                               return L"[destroyed-connection]";
+               }
+
+               void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) override
                {
                        auto conn = connection_.lock();
 
                        if (conn)
                                return conn->add_lifecycle_bound_object(key, lifecycle_bound);
                }
-               virtual std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key)
+
+               std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) override
                {
                        auto conn = connection_.lock();
 
@@ -131,6 +142,11 @@ public:
        {
                return L"[" + name_ + L"]";
        }
+
+       std::wstring address() const
+       {
+               return u16(socket_->local_endpoint().address().to_string());
+       }
        
        virtual void send(std::string&& data)
        {
index 1810da156bb094a38e6a86da13cc1f10bef54df2..e9402421e4d752585c5c5f6915ed2b218d1d534c 100644 (file)
 #include "protocol_strategy.h"
 
 namespace caspar { namespace IO {
-/*
-class ClientInfo 
-{
-protected:
-       ClientInfo(){}
-
-public:
-       virtual ~ClientInfo(){}
 
-       virtual void Send(const std::wstring& data) = 0;
-       virtual void Disconnect() = 0;
-       virtual std::wstring print() const = 0;
-       virtual void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) = 0;
-       virtual std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) = 0;
-};
-*/
 typedef spl::shared_ptr<client_connection<wchar_t>> ClientInfoPtr;
 
 struct ConsoleClientInfo : public client_connection<wchar_t>
 {
-       virtual void send(std::wstring&& data)
+       void send(std::wstring&& data) override
        {
                std::wcout << (L"#" + caspar::log::replace_nonprintable_copy(data, L'?'));
        }
-       virtual void disconnect() {}
-       virtual std::wstring print() const {return L"Console";}
-       virtual void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) {}
-       virtual std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) { return std::shared_ptr<void>(); }
+       void disconnect() override {}
+       std::wstring print() const override {return L"Console";}
+       std::wstring address() const override { return L"127.0.0.1"; }
+       void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) override {}
+       std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) override { return std::shared_ptr<void>(); }
 };
 
 }}
index 422e8db961c224fee01547cfeef15b044cf5b3c9..4efa2004f7b89d520a932cda1ecf01fa4ac2bf05 100644 (file)
@@ -65,6 +65,7 @@ public:
        virtual void send(std::basic_string<CharT>&& data) = 0;\r
        virtual void disconnect() = 0;\r
        virtual std::wstring print() const = 0;\r
+       virtual std::wstring address() const = 0;\r
 \r
        virtual void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) = 0;\r
        virtual std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) = 0;\r
index 086d9a15508a859df8de05330b155d476050cb57..8f422dfbb3cddeb484efb039d377e0e1c525ce1a 100644 (file)
@@ -40,7 +40,7 @@ public:
        {\r
        }\r
 \r
-       virtual void parse(const std::basic_string<char>& data)\r
+       void parse(const std::basic_string<char>& data) override\r
        {\r
                auto utf_data = boost::locale::conv::to_utf<wchar_t>(data, codepage_);\r
 \r
@@ -65,29 +65,33 @@ public:
                CASPAR_LOG(info) << "from_unicode_client_connection destroyed.";\r
        }\r
 \r
-       virtual void send(std::basic_string<wchar_t>&& data)\r
+       void send(std::basic_string<wchar_t>&& data) override\r
        {\r
                auto str = boost::locale::conv::from_utf<wchar_t>(std::move(data), codepage_);\r
 \r
                client_->send(std::move(str));\r
        }\r
 \r
-       virtual void disconnect()\r
+       void disconnect() override\r
        {\r
                client_->disconnect();\r
        }\r
 \r
-       virtual std::wstring print() const\r
+       std::wstring print() const override\r
        {\r
                return client_->print();\r
        }\r
 \r
+       std::wstring address() const override\r
+       {\r
+               return client_->address();\r
+       }\r
 \r
-       void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound)\r
+       void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) override\r
        {\r
                client_->add_lifecycle_bound_object(key, lifecycle_bound);\r
        }\r
-       std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key)\r
+       std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) override\r
        {\r
                return client_->remove_lifecycle_bound_object(key);\r
        }\r
@@ -168,7 +172,7 @@ public:
                CASPAR_LOG(info) << "legacy_strategy_adapter destroyed.";\r
        }\r
 \r
-       virtual void parse(const std::basic_string<wchar_t>& data)\r
+       void parse(const std::basic_string<wchar_t>& data) override\r
        {\r
                strategy_->Parse(data, client_info_);\r
        }\r