2.0.0.2: Updated ffmpeg.

[casparcg] / modules / ffmpeg / producer / filter / filter.cpp

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index d2c3bd41fee7a994e9c7b7f65167ed6bf1aa61a4..0b6b38d54ff1894becb962dc12c0edf6bfafdf03 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -22,29 +22,15 @@ extern "C"
        #include <libavfilter/avfilter.h>\r
        #include <libavfilter/avcodec.h>\r
        #include <libavfilter/avfiltergraph.h>\r
-       #include <libavfilter/vsink_buffer.h>\r
+       #include <libavfilter/buffersink.h>\r
        #include <libavfilter/vsrc_buffer.h>\r
 }\r
 #if defined(_MSC_VER)\r
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
-PixelFormat pix_fmts[] = \r
-{\r
-       PIX_FMT_YUV420P,\r
-       PIX_FMT_YUVA420P,\r
-       PIX_FMT_YUV422P,\r
-       PIX_FMT_YUV444P,\r
-       PIX_FMT_YUV411P,\r
-       PIX_FMT_ARGB, \r
-       PIX_FMT_RGBA,\r
-       PIX_FMT_ABGR,\r
-       PIX_FMT_GRAY8,\r
-       PIX_FMT_NONE\r
-};     \r
-\r
 struct filter::implementation\r
 {\r
        std::string                                             filters_;\r
@@ -52,11 +38,29 @@ struct filter::implementation
        AVFilterContext*                                buffersink_ctx_;\r
        AVFilterContext*                                buffersrc_ctx_;\r
        std::shared_ptr<void>                   parallel_yadif_ctx_;\r
+       std::vector<PixelFormat>                pix_fmts_;\r
                \r
-       implementation(const std::wstring& filters) \r
+       implementation(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) \r
                : filters_(narrow(filters))\r
                , parallel_yadif_ctx_(nullptr)\r
+               , pix_fmts_(pix_fmts)\r
        {\r
+               if(pix_fmts_.empty())\r
+               {\r
+                       pix_fmts_.push_back(PIX_FMT_YUV420P);\r
+                       pix_fmts_.push_back(PIX_FMT_YUVA420P);\r
+                       pix_fmts_.push_back(PIX_FMT_YUV422P);\r
+                       pix_fmts_.push_back(PIX_FMT_YUV444P);\r
+                       pix_fmts_.push_back(PIX_FMT_YUV411P);\r
+                       pix_fmts_.push_back(PIX_FMT_ARGB);\r
+                       pix_fmts_.push_back(PIX_FMT_RGBA);\r
+                       pix_fmts_.push_back(PIX_FMT_ABGR);\r
+                       pix_fmts_.push_back(PIX_FMT_GRAY8);\r
+                       pix_fmts_.push_back(PIX_FMT_NONE);\r
+               }\r
+               else\r
+                       pix_fmts_.push_back(PIX_FMT_NONE);\r
+\r
                std::transform(filters_.begin(), filters_.end(), filters_.begin(), ::tolower);\r
        }\r
        \r
@@ -74,7 +78,6 @@ struct filter::implementation
 \r
        void push(const std::shared_ptr<AVFrame>& frame)\r
        {               \r
-\r
                if(!graph_)\r
                {\r
                        graph_.reset(avfilter_graph_alloc(), [](AVFilterGraph* p){avfilter_graph_free(&p);});\r
@@ -85,7 +88,9 @@ struct filter::implementation
                        THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersrc_ctx_, avfilter_get_by_name("buffer"), "src", args.str().c_str(), NULL, graph_.get()), "[filter]");\r
 \r
                        // OPIX_FMT_BGRAutput\r
-                       THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts, graph_.get()), "[filter]");\r
+                       AVBufferSinkParams *buffersink_params = av_buffersink_params_alloc();\r
+                       buffersink_params->pixel_fmts = pix_fmts_.data();\r
+                       THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, buffersink_params, graph_.get()), "[filter]");\r
                        \r
                        AVFilterInOut* outputs = avfilter_inout_alloc();\r
                        AVFilterInOut* inputs  = avfilter_inout_alloc();\r
@@ -128,7 +133,7 @@ struct filter::implementation
                while (avfilter_poll_frame(buffersink_ctx_->inputs[0])) \r
                {\r
                        AVFilterBufferRef *picref;\r
-                       THROW_ON_ERROR2(av_vsink_buffer_get_video_buffer_ref(buffersink_ctx_, &picref, 0), "[filter]");\r
+                       THROW_ON_ERROR2(av_buffersink_get_buffer_ref(buffersink_ctx_, &picref, 0), "[filter]");\r
 \r
             if (picref) \r
                        {               \r
@@ -160,8 +165,9 @@ struct filter::implementation
        }\r
 };\r
 \r
-filter::filter(const std::wstring& filters) : impl_(new implementation(filters)){}\r
+filter::filter(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) : impl_(new implementation(filters, pix_fmts)){}\r
 filter::filter(filter&& other) : impl_(std::move(other.impl_)){}\r
 filter& filter::operator=(filter&& other){impl_ = std::move(other.impl_); return *this;}\r
 std::vector<safe_ptr<AVFrame>> filter::execute(const std::shared_ptr<AVFrame>& frame) {return impl_->execute(frame);}\r
-}
\ No newline at end of file
+\r
+}}
\ No newline at end of file