Credit Andrew - updating patches for FFmpeg 7.0 as needed since 6.1, now at 7.0,...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / pluginfclient.C

diff --git a/cinelerra-5.1/cinelerra/pluginfclient.C b/cinelerra-5.1/cinelerra/pluginfclient.C
index 32c3f4aae9846aa4ac76b8759fd6c4eb536260e7..b8694b120e29ca26a36adde2e701094d99b86070 100644 (file)
--- a/cinelerra-5.1/cinelerra/pluginfclient.C
+++ b/cinelerra-5.1/cinelerra/pluginfclient.C
@@ -1,3 +1,23 @@
+/*
+ * CINELERRA
+ * Copyright (C) 2016-2020 William Morrow
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>


@@ -17,6 +37,8 @@
 #include "vframe.h"
 #include "filexml.h"
 
 #include "vframe.h"
 #include "filexml.h"
 

+#include "libavfilter/version.h"
+

 #ifdef FFMPEG3
 #define av_filter_iterate(p) ((*(const AVFilter**)(p))=avfilter_next(*(const AVFilter **)(p)))
 #endif
 #ifdef FFMPEG3
 #define av_filter_iterate(p) ((*(const AVFilter**)(p))=avfilter_next(*(const AVFilter **)(p)))
 #endif


@@ -431,7 +453,7 @@ int PluginFClient_Opt::types(char *rp)
        case AV_OPT_TYPE_SAMPLE_FMT: cp = "<sample_fmt>"; break;
        case AV_OPT_TYPE_DURATION: cp = "<duration>"; break;
        case AV_OPT_TYPE_COLOR: cp = "<color>"; break;
        case AV_OPT_TYPE_SAMPLE_FMT: cp = "<sample_fmt>"; break;
        case AV_OPT_TYPE_DURATION: cp = "<duration>"; break;
        case AV_OPT_TYPE_COLOR: cp = "<color>"; break;

-       case AV_OPT_TYPE_CHANNEL_LAYOUT: cp = "<channel_layout>";  break;
+       case AV_OPT_TYPE_CHLAYOUT: cp = "<channel_layout>";  break;

        default: cp = "<undef>";  break;
        }
        return sprintf(rp, "%s", cp);
        default: cp = "<undef>";  break;
        }
        return sprintf(rp, "%s", cp);


@@ -642,11 +664,19 @@ PluginFClient::~PluginFClient()
 bool PluginFClient::is_audio(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;
 bool PluginFClient::is_audio(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;

+#if LIBAVFILTER_VERSION_MAJOR > 8
+       if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
+#else

        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;
        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;

+#endif

        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
        if( !fp->inputs ) return 1;
        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
        if( !fp->inputs ) return 1;

+#if  LIBAVFILTER_VERSION_MAJOR > 8
+       if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
+#else

        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;
        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;

+#endif

        if( !avfilter_pad_get_name(fp->inputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->inputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
        return 1;
        if( !avfilter_pad_get_name(fp->inputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->inputs, 0) != AVMEDIA_TYPE_AUDIO ) return 0;
        return 1;


@@ -654,11 +684,19 @@ bool PluginFClient::is_audio(const AVFilter *fp)
 bool PluginFClient::is_video(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;
 bool PluginFClient::is_video(const AVFilter *fp)
 {
        if( !fp->outputs ) return 0;

+#if  LIBAVFILTER_VERSION_MAJOR > 8 
+       if( avfilter_filter_pad_count(fp, 1) > 1 ) return 0;
+#else

        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;
        if( avfilter_pad_count(fp->outputs) > 1 ) return 0;

+#endif

        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
        if( !fp->inputs ) return 1;
        if( !avfilter_pad_get_name(fp->outputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->outputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
        if( !fp->inputs ) return 1;

+#if  LIBAVFILTER_VERSION_MAJOR > 8
+       if( avfilter_filter_pad_count(fp, 0) > 1 ) return 0;
+#else

        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;
        if( avfilter_pad_count(fp->inputs) > 1 ) return 0;

+#endif

        if( !avfilter_pad_get_name(fp->inputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->inputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
        return 1;
        if( !avfilter_pad_get_name(fp->inputs, 0) ) return 0;
        if( avfilter_pad_get_type(fp->inputs, 0) != AVMEDIA_TYPE_VIDEO ) return 0;
        return 1;


@@ -807,16 +845,24 @@ int PluginFAClient::activate()
        }
        AVSampleFormat sample_fmt = AV_SAMPLE_FMT_FLTP;
        int channels = PluginClient::total_in_buffers;
        }
        AVSampleFormat sample_fmt = AV_SAMPLE_FMT_FLTP;
        int channels = PluginClient::total_in_buffers;

-       uint64_t layout = (((uint64_t)1)<<channels) - 1;
+       //uint64_t layout = (((uint64_t)1)<<channels) - 1;
+       AVChannelLayout layout;
+       
+       av_channel_layout_default(&layout, channels);
+       
+       char chLayoutDescription[128];
+       av_channel_layout_describe(&layout, chLayoutDescription, sizeof(chLayoutDescription));
+    

        AVFilterGraph *graph = !ffilt ? 0 : ffilt->graph;
        int ret = !graph ? -1 : 0;
        if( ret >= 0 && ffilt->filter->inputs ) {
                char args[BCTEXTLEN];
                snprintf(args, sizeof(args),
        AVFilterGraph *graph = !ffilt ? 0 : ffilt->graph;
        int ret = !graph ? -1 : 0;
        if( ret >= 0 && ffilt->filter->inputs ) {
                char args[BCTEXTLEN];
                snprintf(args, sizeof(args),

-                       "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x%jx",
-                       1, sample_rate, sample_rate, av_get_sample_fmt_name(sample_fmt), layout);
+                       "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=%s:channels=%i",
+                       1, sample_rate, sample_rate, av_get_sample_fmt_name(sample_fmt), chLayoutDescription, channels);

                ret = avfilter_graph_create_filter(&fsrc, avfilter_get_by_name("abuffer"),
                        "in", args, NULL, graph);
                ret = avfilter_graph_create_filter(&fsrc, avfilter_get_by_name("abuffer"),
                        "in", args, NULL, graph);

+               if(ret <0) printf("abuffer failed!\n");

        }
        if( ret >= 0 )
                ret = avfilter_graph_create_filter(&fsink, avfilter_get_by_name("abuffersink"),
        }
        if( ret >= 0 )
                ret = avfilter_graph_create_filter(&fsink, avfilter_get_by_name("abuffersink"),


@@ -825,8 +871,8 @@ int PluginFAClient::activate()
                ret = av_opt_set_bin(fsink, "sample_fmts",
                        (uint8_t*)&sample_fmt, sizeof(sample_fmt), AV_OPT_SEARCH_CHILDREN);
        if( ret >= 0 )
                ret = av_opt_set_bin(fsink, "sample_fmts",
                        (uint8_t*)&sample_fmt, sizeof(sample_fmt), AV_OPT_SEARCH_CHILDREN);
        if( ret >= 0 )

-               ret = av_opt_set_bin(fsink, "channel_layouts",
-                       (uint8_t*)&layout, sizeof(layout), AV_OPT_SEARCH_CHILDREN);
+               ret = av_opt_set(fsink, "ch_layouts",
+                       chLayoutDescription, AV_OPT_SEARCH_CHILDREN);

        if( ret >= 0 )
                ret = av_opt_set_bin(fsink, "sample_rates",
                        (uint8_t*)&sample_rate, sizeof(sample_rate), AV_OPT_SEARCH_CHILDREN);
        if( ret >= 0 )
                ret = av_opt_set_bin(fsink, "sample_rates",
                        (uint8_t*)&sample_rate, sizeof(sample_rate), AV_OPT_SEARCH_CHILDREN);


@@ -952,9 +998,19 @@ int PluginFAClient::process_buffer(int64_t size, Samples **buffer, int64_t start
        if( ret >= 0 ) {
                in_channels = get_inchannels();
                out_channels = get_outchannels();
        if( ret >= 0 ) {
                in_channels = get_inchannels();
                out_channels = get_outchannels();

+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,24,100)
+               AVChannelLayout in_ch_layout;
+               AVFilterContext *fctx = ffilt->fctx;
+               AVFilterLink **links = !fctx->nb_outputs ? 0 : fctx->outputs;
+               av_channel_layout_copy(&in_ch_layout, &links[0]->ch_layout);
+#endif

                frame->nb_samples = size;
                frame->format = AV_SAMPLE_FMT_FLTP;
                frame->nb_samples = size;
                frame->format = AV_SAMPLE_FMT_FLTP;

+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,3,100)
+               av_channel_layout_copy(&frame->ch_layout, &in_ch_layout);
+#else

                frame->channel_layout = (1<<in_channels)-1;
                frame->channel_layout = (1<<in_channels)-1;

+#endif

                frame->sample_rate = sample_rate;
                frame->pts = filter_position;
        }
                frame->sample_rate = sample_rate;
                frame->pts = filter_position;
        }