[ffmpeg] Copied flush logic when seeking from 2.0, as well as current frame in clip...

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

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index f8b8894b436ea0a261da9d0d45200b3487241e3f..eb773c6c115f5818572bdee16ddd1072e409a4ba 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -205,8 +205,7 @@ core::mutable_frame make_frame(const void* tag, const spl::shared_ptr<AVFrame>&
                                                                        boost::errinfo_api_function("sws_getContext"));
                }       
                
-               spl::shared_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free);      
-               avcodec_get_frame_defaults(av_frame.get());                     
+               auto av_frame = create_frame();
                if(target_pix_fmt == PIX_FMT_BGRA)
                {
                        auto size = avpicture_fill(reinterpret_cast<AVPicture*>(av_frame.get()), write.image_data(0).begin(), PIX_FMT_BGRA, width, height);
@@ -273,8 +272,7 @@ spl::shared_ptr<AVFrame> make_av_frame(core::mutable_frame& frame)
 
 spl::shared_ptr<AVFrame> make_av_frame(std::array<uint8_t*, 4> data, const core::pixel_format_desc& pix_desc)
 {
-       spl::shared_ptr<AVFrame> av_frame(avcodec_alloc_frame(), av_free);      
-       avcodec_get_frame_defaults(av_frame.get());
+       auto av_frame = create_frame();
        
        auto planes              = pix_desc.planes;
        auto format              = pix_desc.format;
@@ -485,15 +483,28 @@ spl::shared_ptr<AVPacket> create_packet()
 
 spl::shared_ptr<AVFrame> create_frame()
 {      
-       spl::shared_ptr<AVFrame> frame(avcodec_alloc_frame(), av_free);
+       spl::shared_ptr<AVFrame> frame(av_frame_alloc(), [](AVFrame* p)
+       {
+               av_frame_free(&p);
+       });
        avcodec_get_frame_defaults(frame.get());
        return frame;
 }
 
+std::shared_ptr<AVFrame> flush()
+{
+       static std::shared_ptr<AVFrame> dummy(av_frame_alloc(), [](AVFrame* p)
+       {
+               av_frame_free(&p);
+       });
+
+       return dummy;
+}
+
 spl::shared_ptr<AVCodecContext> open_codec(AVFormatContext& context, enum AVMediaType type, int& index, bool single_threaded)
 {      
        AVCodec* decoder;
-       index = THROW_ON_ERROR2(av_find_best_stream(&context, type, -1, -1, &decoder, 0), "");
+       index = THROW_ON_ERROR2(av_find_best_stream(&context, type, index, -1, &decoder, 0), "");
        //if(strcmp(decoder->name, "prores") == 0 && decoder->next && strcmp(decoder->next->name, "prores_lgpl") == 0)
        //      decoder = decoder->next;
 
@@ -587,7 +598,7 @@ bool is_valid_file(const std::wstring& filename, bool only_video)
                buf.push_back(*file_it);
 
        if(buf.empty())
-               return nullptr;
+               return false;
 
        pb.buf          = buf.data();
        pb.buf_size = static_cast<int>(buf.size());
@@ -644,10 +655,8 @@ std::wstring probe_stem(const std::wstring& stem, bool only_video)
        return L"";
 }
 
-core::audio_channel_layout get_audio_channel_layout(const AVCodecContext& codec_context, const std::wstring& channel_layout_spec)
+core::audio_channel_layout get_audio_channel_layout(int num_channels, std::uint64_t layout, const std::wstring& channel_layout_spec)
 {
-       auto num_channels = codec_context.channels;
-
        if (!channel_layout_spec.empty())
        {
                if (boost::contains(channel_layout_spec, L":")) // Custom on the fly layout specified.
@@ -661,18 +670,18 @@ core::audio_channel_layout get_audio_channel_layout(const AVCodecContext& codec_
                }
                else // Preconfigured named channel layout selected.
                {
-                       auto layout = core::audio_channel_layout_repository::get_default()->get_layout(channel_layout_spec);
+                       auto channel_layout = core::audio_channel_layout_repository::get_default()->get_layout(channel_layout_spec);
 
-                       if (!layout)
+                       if (!channel_layout)
                                CASPAR_THROW_EXCEPTION(user_error() << msg_info(L"No channel layout with name " + channel_layout_spec + L" registered"));
 
-                       layout->num_channels = num_channels;
+                       channel_layout->num_channels = num_channels;
 
-                       return *layout;
+                       return *channel_layout;
                }
        }
 
-       if (!codec_context.channel_layout)
+       if (!layout)
        {
                if (num_channels == 1)
                        return core::audio_channel_layout(num_channels, L"mono", L"FC");
@@ -688,7 +697,7 @@ core::audio_channel_layout get_audio_channel_layout(const AVCodecContext& codec_
        // than the most common (5.1, mono and stereo) types.
 
        // Based on information in https://ffmpeg.org/ffmpeg-utils.html#Channel-Layout
-       switch (codec_context.channel_layout)
+       switch (layout)
        {
        case AV_CH_LAYOUT_MONO:
                return core::audio_channel_layout(num_channels, L"mono",                        L"FC");