]> git.sesse.net Git - casparcg/commitdiff
Merged relevant changes from pull #275
authorHelge Norberg <helge.norberg@gmail.com>
Wed, 18 Jun 2014 12:56:30 +0000 (14:56 +0200)
committerHelge Norberg <helge.norberg@gmail.com>
Wed, 18 Jun 2014 12:56:30 +0000 (14:56 +0200)
- enables streaming from a channel to a remote destination
- renamed ffmpeg_consumer to streaming_consumer to let both the old and the new consumer coexist until the old features are integrated in the new implementation like SEPARATE_KEY. Also the stability needs to be proven.

14 files changed:
common/common.vcxproj
common/common.vcxproj.filters
common/scope_exit.h [new file with mode: 0644]
core/core.vcxproj
core/core.vcxproj.filters
core/fwd.h [new file with mode: 0644]
core/parameters/parameters.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/ffmpeg.vcxproj
modules/ffmpeg/ffmpeg.vcxproj.filters
modules/ffmpeg/util/error.cpp [new file with mode: 0644]
modules/ffmpeg/util/error.h [new file with mode: 0644]

index 048f17d5216ac03d3dc1edf4e3058c10a63e7a59..543590c5f15a96000def9766a6ced1eccaed6acf 100644 (file)
     <ClInclude Include="env.h" />\r
     <ClInclude Include="os\windows\current_version.h" />\r
     <ClInclude Include="os\windows\system_info.h" />\r
+    <ClInclude Include="scope_exit.h" />\r
     <ClInclude Include="stdafx.h" />\r
     <ClInclude Include="utility\assert.h" />\r
     <ClInclude Include="utility\base64.h" />\r
index 6addb35d3d82c11d985d56760bafef6723e06bf1..b1ff31e97936f6c156074b9228b62dbb08a33fe4 100644 (file)
     <ClInclude Include="memory\endian.h">\r
       <Filter>source\memory</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="scope_exit.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file
diff --git a/common/scope_exit.h b/common/scope_exit.h
new file mode 100644 (file)
index 0000000..1513511
--- /dev/null
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "exception/exceptions.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 b0ec10c622b1ab83c97eedbf5a5b2a8ceb6609e7..9f38ebf0c7a29e405c8a46a265fc1064bf6e6182 100644 (file)
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\write_frame_consumer.h" />\r
+    <ClInclude Include="fwd.h" />\r
     <ClInclude Include="mixer\audio\audio_util.h" />\r
     <ClInclude Include="mixer\gpu\fence.h" />\r
     <ClInclude Include="mixer\gpu\shader.h" />\r
index 2732d90fcc93dda4b1b608e6d8619da1790242e6..afadfd64503745f421c6ca456517ce4623ed168e 100644 (file)
     <ClInclude Include="producer\media_info\in_memory_media_info_repository.h">\r
       <Filter>source\producer\media_info</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="fwd.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r
diff --git a/core/fwd.h b/core/fwd.h
new file mode 100644 (file)
index 0000000..df7c34b
--- /dev/null
@@ -0,0 +1,10 @@
+#pragma once
+
+namespace caspar { namespace core {
+
+struct frame_producer;
+struct frame_consumer;
+struct frame_factory;
+class parameters;
+
+}}
\ No newline at end of file
index d1f0079731e1321b3e01bb4377e2b59e5ae735e4..c63c68b6a44c6bbb7e096db720368a36053df72b 100644 (file)
@@ -97,7 +97,7 @@ std::wstring parameters::get(std::wstring const& key, std::wstring const& defaul
 std::wstring parameters::get_original_string() const
 {
        std::wstring str;
-       BOOST_FOREACH(auto& param, params_)
+       BOOST_FOREACH(auto& param, params_original_)
        {
                str += param + L" ";
        }
diff --git a/modules/ffmpeg/consumer/streaming_consumer.cpp b/modules/ffmpeg/consumer/streaming_consumer.cpp
new file mode 100644 (file)
index 0000000..d7bd4b2
--- /dev/null
@@ -0,0 +1,1257 @@
+#include "../StdAfx.h"
+
+#include "ffmpeg_consumer.h"
+
+#include "../util/error.h"
+
+#include <common/exception/win32_exception.h>
+#include <common/concurrency/executor.h>
+#include <common/utility/assert.h>
+#include <common/utility/string.h>
+#include <common/concurrency/future_util.h>
+#include <common/env.h>
+#include <common/scope_exit.h>
+
+#include <core/parameters/parameters.h>
+#include <core/consumer/frame_consumer.h>
+#include <core/mixer/read_frame.h>
+#include <core/producer/frame/pixel_format.h>
+#include <core/video_format.h>
+
+#include <boost/noncopyable.hpp>
+#include <boost/rational.hpp>
+#include <boost/format.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#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 {
+       
+class streaming_consumer sealed : public core::frame_consumer
+{
+public:
+       // Static Members
+               
+private:
+       
+       boost::filesystem::path                                         path_;
+
+       std::map<std::string, std::string>                      options_;
+                                                                                               
+       core::video_format_desc                                         in_video_format_;
+       core::channel_layout                                            in_channel_layout_;
+
+       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_filter_executor_;
+       executor                                                                        audio_filter_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_(std::move(path))
+               , video_pts_(0)
+               , audio_pts_(0)
+               , executor_(print())
+               , audio_encoder_executor_(print() + L" video_encoder")
+               , video_encoder_executor_(print() + L" audio_encoder")
+               , write_executor_(print() + L" io")
+               , video_filter_executor_(print() + L" video_filter")
+               , audio_filter_executor_(print() + L" audio_filter")
+       {               
+               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_)
+               {
+                       encode_video(nullptr, nullptr);
+                       encode_audio(nullptr, nullptr);                 
+
+                       video_filter_executor_.wait();
+                       audio_filter_executor_.wait();
+
+                       video_graph_.reset();
+                       audio_graph_.reset();
+                       
+                       video_encoder_executor_.wait();
+                       audio_encoder_executor_.wait();
+                       
+                       video_st_.reset();
+                       audio_st_.reset();
+
+                       write_packet(nullptr, nullptr);
+
+                       write_executor_.wait();
+                                       
+                       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,
+               const core::channel_layout& audio_channel_layout,
+               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_ = 
+                                               narrow(
+                                                       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;
+                       in_channel_layout_ = audio_channel_layout;
+                                                       
+                       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);
+                       
+                       CASPAR_VERIFY(video_codec);
+                       CASPAR_VERIFY(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);             
+
+                       BOOST_FOREACH(const auto& option, options_)
+                       {
+                               CASPAR_LOG(warning) 
+                                       << L"Invalid option: -" 
+                                       << widen(option.first) 
+                                       << L" " 
+                                       << widen(option.second);
+                       }
+               }
+               catch(...)
+               {
+                       video_st_.reset();
+                       audio_st_.reset();
+                       oc_.reset();
+                       throw;
+               }
+       }
+
+       boost::unique_future<bool> send(const safe_ptr<core::read_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"ffmpeg_consumer[" + widen(path_.string()) + L"]";
+       }
+       
+       virtual boost::property_tree::wptree info() const override
+       {
+               return boost::property_tree::wptree();
+       }
+
+       bool has_synchronization_clock() const override
+       {
+               return false;
+       }
+
+       size_t buffer_depth() const override
+       {
+               return 0;
+       }
+
+       int index() const override
+       {
+               return 200;
+       }
+
+       int64_t presentation_frame_age_millis() const override
+       {
+               return 0;
+       }
+
+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)
+                       <<      widen(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_channel_layout_.num_channels
+                       % 1     % in_video_format_.audio_sample_rate
+                       % boost::io::group(
+                               std::hex, 
+                               std::showbase, 
+                               av_get_default_channel_layout(in_channel_layout_.num_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) 
+                       <<      widen(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(
+               const std::shared_ptr<core::read_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)
+               {
+                       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(
+               const std::shared_ptr<core::read_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)
+               {
+                       src_av_frame.reset(
+                               av_frame_alloc(), 
+                               [](AVFrame* p)
+                               {
+                                       av_frame_free(&p);
+                               });
+               
+                       src_av_frame->channels           = frame_ptr->num_channels();
+                       src_av_frame->channel_layout = av_get_default_channel_layout(frame_ptr->num_channels());
+                       src_av_frame->sample_rate        = in_video_format_.audio_sample_rate;
+                       src_av_frame->nb_samples         = 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)
+       {               
+               BOOST_FOREACH(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;
+       }
+};
+       
+safe_ptr<core::frame_consumer> create_streaming_consumer(const core::parameters& params)
+{       
+    static boost::wregex path_exp(L"\\s*(STREAM\\s)?(?<PATH>.+\\.[^\\s]+|.+:[^\\s]*)\\s*(?<ARGS>.*)" , boost::regex::icase);
+
+       auto str = params.get_original_string();
+
+    boost::wsmatch what;
+       if(!boost::regex_match(str, what, path_exp))
+         return core::frame_consumer::empty();
+                                  
+    return make_safe<streaming_consumer>(
+               narrow(what["PATH"].str()),
+               narrow(what["ARGS"].str()));
+}
+
+safe_ptr<core::frame_consumer> create_streaming_consumer(const boost::property_tree::wptree& ptree)
+{                      
+    return make_safe<streaming_consumer>(
+               narrow(ptree.get<std::wstring>(L"path")), 
+               narrow(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..79688b0
--- /dev/null
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <common/memory/safe_ptr.h>
+
+#include <core/fwd.h>
+
+#include <boost/property_tree/ptree.hpp>
+
+#include <string>
+#include <vector>
+
+namespace caspar { namespace ffmpeg {
+       
+safe_ptr<core::frame_consumer> create_streaming_consumer(
+               const core::parameters& params);
+safe_ptr<core::frame_consumer> create_streaming_consumer(
+               const boost::property_tree::wptree& ptree);
+
+}}
\ No newline at end of file
index 0b94107edf652f95bf47c96dad049dfcdd80a987..287288775b4cab5d240937177464dafc7c633db8 100644 (file)
@@ -22,6 +22,7 @@
 #include "StdAfx.h"\r
 \r
 #include "consumer/ffmpeg_consumer.h"\r
+#include "consumer/streaming_consumer.h"\r
 #include "producer/ffmpeg_producer.h"\r
 #include "producer/util/util.h"\r
 \r
@@ -254,6 +255,7 @@ void init(const safe_ptr<core::media_info_repository>& media_info_repo)
     avformat_network_init();\r
        \r
        core::register_consumer_factory([](const core::parameters& params){return ffmpeg::create_consumer(params);});\r
+       core::register_consumer_factory([](const core::parameters& params){return ffmpeg::create_streaming_consumer(params);});\r
        core::register_producer_factory(create_producer);\r
        core::register_thumbnail_producer_factory(create_thumbnail_producer);\r
 \r
index 4f28e7a01430e293202217e2c6ac7dc99bc76b0b..eaeb44590d518a6894d41765e98eb450e2d9e781 100644 (file)
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
+    <ClCompile Include="consumer\streaming_consumer.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
     <ClCompile Include="ffmpeg.cpp">\r
       <ShowIncludes Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">false</ShowIncludes>\r
     </ClCompile>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
     </ClCompile>\r
+    <ClCompile Include="util\error.cpp">\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="consumer\ffmpeg_consumer.h" />\r
+    <ClInclude Include="consumer\streaming_consumer.h" />\r
     <ClInclude Include="ffmpeg.h" />\r
     <ClInclude Include="ffmpeg_error.h" />\r
     <ClInclude Include="ffmpeg_params.h" />\r
     <ClInclude Include="producer\util\util.h" />\r
     <ClInclude Include="producer\video\video_decoder.h" />\r
     <ClInclude Include="StdAfx.h" />\r
+    <ClInclude Include="util\error.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\common\common.vcxproj">\r
index 30e946f14a4f39318f17a8565f25d042f7a3cefc..209885f421973c063342e376a38036ab630f31df 100644 (file)
@@ -28,6 +28,9 @@
     <Filter Include="source\producer\muxer">\r
       <UniqueIdentifier>{26599786-a0d9-4cc3-b5a4-633e9c81563a}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="source\util">\r
+      <UniqueIdentifier>{705c5729-22cc-46bc-8920-da5be59244e1}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\video\video_decoder.cpp">\r
     <ClCompile Include="producer\audio\audio_resampler.cpp">\r
       <Filter>source\producer\audio</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="util\error.cpp">\r
+      <Filter>source\util</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="consumer\streaming_consumer.cpp">\r
+      <Filter>source\consumer</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="producer\ffmpeg_producer.h">\r
     <ClInclude Include="producer\audio\audio_resampler.h">\r
       <Filter>source\producer\audio</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="util\error.h">\r
+      <Filter>source\util</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="consumer\streaming_consumer.h">\r
+      <Filter>source\consumer</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file
diff --git a/modules/ffmpeg/util/error.cpp b/modules/ffmpeg/util/error.cpp
new file mode 100644 (file)
index 0000000..2f7db93
--- /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/utility/string.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, narrow(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..b4a94db
--- /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/exception/exceptions.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;                                                                                                                     \
+       }()
+
+}}