git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 66bc664cfe16c5bcecacbdf99c1f60fdebc39afd..da55e707812c348c6ec232fe759ea0bcbd9dd4df 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -53,7 +53,7 @@ extern "C"
        #define __STDC_CONSTANT_MACROS\r
        #define __STDC_LIMIT_MACROS\r
        #include <libavformat/avformat.h>\r
-       #include <libswscale/swscale.h>
+       #include <libswscale/swscale.h>\r
        #include <libavutil/opt.h>\r
 }\r
 #if defined(_MSC_VER)\r
@@ -92,7 +92,7 @@ struct ffmpeg_consumer : boost::noncopyable
        int64_t                                                                 frame_number_;\r
        \r
 public:\r
-       ffmpeg_consumer(const std::string& filename, const core::video_format_desc& format_desc, const std::string& codec, int bitrate)\r
+       ffmpeg_consumer(const std::string& filename, const core::video_format_desc& format_desc, const std::string& codec, const std::string& options)\r
                : filename_(filename + ".mov")\r
                , video_outbuf_(1920*1080*8)\r
                , audio_outbuf_(48000)\r
@@ -124,7 +124,7 @@ public:
                        BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info(codec));\r
 \r
                //  Add the audio and video streams using the default format codecs     and initialize the codecs .\r
-               video_st_ = add_video_stream(video_codec->id, bitrate);\r
+               video_st_ = add_video_stream(video_codec->id, options);\r
                audio_st_ = add_audio_stream();\r
                                \r
                dump_format(oc_.get(), 0, filename_.c_str(), 1);\r
@@ -176,7 +176,8 @@ public:
                return L"ffmpeg[" + widen(filename_) + L"]";\r
        }\r
 \r
-       std::shared_ptr<AVStream> add_video_stream(enum CodecID codec_id, int bitrate)\r
+\r
+       std::shared_ptr<AVStream> add_video_stream(enum CodecID codec_id, const std::string& options)\r
        { \r
                auto st = av_new_stream(oc_.get(), 0);\r
                if (!st) \r
@@ -193,11 +194,8 @@ public:
                auto c = st->codec;\r
 \r
                avcodec_get_context_defaults3(c, encoder);\r
-\r
-               bitrate *= 1000000;\r
-               \r
+                               \r
                c->codec_id                     = codec_id;\r
-               c->bit_rate                     = bitrate > 0 ? bitrate : format_desc_.width < 1280 ? 63*1000000 : 220*1000000;\r
                c->codec_type           = AVMEDIA_TYPE_VIDEO;\r
                c->width                        = format_desc_.width;\r
                c->height                       = format_desc_.height;\r
@@ -207,29 +205,41 @@ public:
 \r
                if(c->codec_id == CODEC_ID_PRORES)\r
                {                       \r
-                       c->bit_rate     = bitrate > 0 ? bitrate : format_desc_.width < 1280 ? 42*1000000 : 147*1000000;\r
+                       c->bit_rate     = c->bit_rate > 0 ? c->bit_rate : format_desc_.width < 1280 ? 42*1000000 : 147*1000000;\r
                        c->pix_fmt      = PIX_FMT_YUV422P10;\r
+                       CASPAR_LOG(info) << print() << L"Options set: " << av_set_options_string(c->priv_data, options.c_str(), "=", ":");\r
                }\r
                else if(c->codec_id == CODEC_ID_DNXHD)\r
                {\r
                        if(format_desc_.width < 1280 || format_desc_.height < 720)\r
                                BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("unsupported dimension"));\r
 \r
-                       c->bit_rate     = bitrate > 0 ? bitrate : 220*1000000;\r
+                       c->bit_rate     = c->bit_rate > 0 ? c->bit_rate : 220*1000000;\r
                        c->pix_fmt      = PIX_FMT_YUV422P;\r
+                       \r
+                       CASPAR_LOG(info) << print() << L"Options set: " << av_set_options_string(c->priv_data, options.c_str(), "=", ":");\r
                }\r
                else if(c->codec_id == CODEC_ID_DVVIDEO)\r
                {\r
-                       c->bit_rate     = bitrate > 0 ? bitrate : format_desc_.width < 1280 ? 50*1000000 : 100*1000000;\r
+                       c->bit_rate     = c->bit_rate > 0 ? c->bit_rate : format_desc_.width < 1280 ? 50*1000000 : 100*1000000;\r
                        c->pix_fmt      = PIX_FMT_YUV422P;\r
+                       \r
+                       CASPAR_LOG(info) << print() << L"Options set: " << av_set_options_string(c->priv_data, options.c_str(), "=", ":");\r
+               }\r
+               else if(c->codec_id == CODEC_ID_H264)\r
+               {                          \r
+                       c->pix_fmt              = PIX_FMT_YUV420P;    \r
+                       av_opt_set(c->priv_data, "preset", "faster", 0);\r
+                       \r
+                       CASPAR_LOG(info) << print() << L"Options set: " << av_set_options_string(c->priv_data, options.c_str(), "=", ":");\r
+\r
+                       c->max_b_frames = 0; // b-franes bit supported.\r
                }\r
-               //else if(st->codec->codec_id == CODEC_ID_H264)\r
-               //{                        \r
-               //      c->pix_fmt = PIX_FMT_YUV422P;    
-               //      THROW_ON_ERROR2(av_opt_set(c->priv_data, "preset", "slow", 0), "[ffmpeg_consumer]");\r
-               //}\r
                else\r
-                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("unsupported codec"));\r
+               {\r
+                       CASPAR_LOG(info) << print() << L"Options set: " << av_set_options_string(c->priv_data, options.c_str(), "=", ":");\r
+                       CASPAR_LOG(warning) << " Potentially unsupported output parameters.";\r
+               }\r
                \r
                if(oc_->oformat->flags & AVFMT_GLOBALHEADER)\r
                        c->flags |= CODEC_FLAG_GLOBAL_HEADER;\r
@@ -273,11 +283,9 @@ public:
                        avcodec_close(st->codec);\r
                });\r
        }\r
-  \r
-       std::shared_ptr<AVPacket> encode_video_frame(const safe_ptr<core::read_frame>& frame)\r
-       { \r
-               auto c = video_st_->codec;\r
- \r
+\r
+       std::shared_ptr<AVFrame> convert_video_frame(const safe_ptr<core::read_frame>& frame, AVCodecContext* c)\r
+       {\r
                if(!img_convert_ctx_) \r
                {\r
                        img_convert_ctx_.reset(sws_getContext(format_desc_.width, format_desc_.height, PIX_FMT_BGRA, c->width, c->height, c->pix_fmt, SWS_BICUBIC, nullptr, nullptr, nullptr), sws_freeContext);\r
@@ -289,16 +297,24 @@ public:
                avpicture_fill(reinterpret_cast<AVPicture*>(av_frame.get()), const_cast<uint8_t*>(frame->image_data().begin()), PIX_FMT_BGRA, format_desc_.width, format_desc_.height);\r
                                \r
                std::shared_ptr<AVFrame> local_av_frame(avcodec_alloc_frame(), av_free);\r
-               local_av_frame->interlaced_frame = format_desc_.field_mode != core::field_mode::progressive;\r
-               local_av_frame->top_field_first  = format_desc_.field_mode == core::field_mode::upper;\r
-               local_av_frame->pts                              = (frame_number_ * video_st_->time_base.den) * video_st_->time_base.num;\r
-\r
                picture_buf_.resize(avpicture_get_size(c->pix_fmt, format_desc_.width, format_desc_.height));\r
                avpicture_fill(reinterpret_cast<AVPicture*>(local_av_frame.get()), picture_buf_.data(), c->pix_fmt, format_desc_.width, format_desc_.height);\r
 \r
                sws_scale(img_convert_ctx_.get(), av_frame->data, av_frame->linesize, 0, c->height, local_av_frame->data, local_av_frame->linesize);\r
-                               \r
-               int out_size = THROW_ON_ERROR2(avcodec_encode_video(c, video_outbuf_.data(), video_outbuf_.size(), local_av_frame.get()), "[ffmpeg_consumer]");\r
+\r
+               return local_av_frame;\r
+       }\r
+  \r
+       std::shared_ptr<AVPacket> encode_video_frame(const safe_ptr<core::read_frame>& frame)\r
+       { \r
+               auto c = video_st_->codec;\r
+ \r
+               auto av_frame = convert_video_frame(frame, c);\r
+               av_frame->interlaced_frame      = format_desc_.field_mode != core::field_mode::progressive;\r
+               av_frame->top_field_first       = format_desc_.field_mode == core::field_mode::upper;\r
+               av_frame->pts                           = frame_number_++;\r
+\r
+               int out_size = THROW_ON_ERROR2(avcodec_encode_video(c, video_outbuf_.data(), video_outbuf_.size(), av_frame.get()), "[ffmpeg_consumer]");\r
                if(out_size > 0)\r
                {\r
                        safe_ptr<AVPacket> pkt(new AVPacket, [](AVPacket* p)\r
@@ -365,7 +381,6 @@ public:
                                        av_write_frame(oc_.get(), video.get());\r
                                if(audio)\r
                                        av_write_frame(oc_.get(), audio.get());\r
-                               ++frame_number_;\r
                                graph_->update_value("write-time", write_timer_.elapsed()*format_desc_.fps*0.5);\r
                        });\r
                });\r
@@ -377,24 +392,24 @@ struct ffmpeg_consumer_proxy : public core::frame_consumer
        const std::wstring      filename_;\r
        const bool                      key_only_;\r
        const std::string       codec_;\r
-       const int                       bitrate_;\r
+       const std::string       options_;\r
 \r
        std::unique_ptr<ffmpeg_consumer> consumer_;\r
 \r
 public:\r
 \r
-       ffmpeg_consumer_proxy(const std::wstring& filename, bool key_only, const std::string codec, int bitrate)\r
+       ffmpeg_consumer_proxy(const std::wstring& filename, bool key_only, const std::string codec, const std::string& options)\r
                : filename_(filename)\r
                , key_only_(key_only)\r
                , codec_(boost::to_lower_copy(codec))\r
-               , bitrate_(bitrate)\r
+               , options_(options)\r
        {\r
        }\r
        \r
        virtual void initialize(const core::video_format_desc& format_desc, int, int)\r
        {\r
                consumer_.reset();\r
-               consumer_.reset(new ffmpeg_consumer(narrow(filename_), format_desc, codec_, bitrate_));\r
+               consumer_.reset(new ffmpeg_consumer(narrow(filename_), format_desc, codec_, options_));\r
        }\r
        \r
        virtual bool send(const safe_ptr<core::read_frame>& frame) override\r
@@ -436,12 +451,12 @@ safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const std::vector<std::wst
        if(codec == "H264" || codec == "h264")\r
                codec = "libx264";\r
 \r
-       int bitrate = 0;        \r
-       auto bitrate_it = std::find(params.begin(), params.end(), L"BITRATE");\r
-       if(bitrate_it != params.end() && bitrate_it++ != params.end())\r
-               bitrate = boost::lexical_cast<int>(*bitrate_it);\r
+       std::string options = "";\r
+       auto options_it = std::find(params.begin(), params.end(), L"OPTIONS");\r
+       if(options_it != params.end() && options_it++ != params.end())\r
+               options = narrow(*options_it);\r
 \r
-       return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + params[1], key_only, codec, bitrate);\r
+       return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + params[1], key_only, codec, boost::to_lower_copy(options));\r
 }\r
 \r
 safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const boost::property_tree::ptree& ptree)\r
@@ -449,9 +464,9 @@ safe_ptr<core::frame_consumer> create_ffmpeg_consumer(const boost::property_tree
        std::string filename = ptree.get<std::string>("path");\r
        auto key_only            = ptree.get("key-only", false);\r
        auto codec                       = ptree.get("codec", "dnxhd");\r
-       auto bitrate             = ptree.get("bitrate", 0);\r
+       auto options             = ptree.get("options", "");\r
        \r
-       return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + widen(filename), key_only, codec, bitrate);\r
+       return make_safe<ffmpeg_consumer_proxy>(env::media_folder() + widen(filename), key_only, codec, options);\r
 }\r
 \r
 }}\r