For now, hard-coded to 1 element.
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -136,7 +136,8 @@ typedef struct LibplaceboContext { · 135 unmodified lines | |||
| 136 | pl_tex tex[4]; | 136 | pl_tex tex[4]; |
| 137 | 137 | ||
| 138 | /* input state */ | 138 | /* input state */ |
| 139 | LibplaceboInput input; | 139 | LibplaceboInput *inputs; |
| 140 | int nb_inputs; | ||
| 140 | 141 | ||
| 141 | /* settings */ | 142 | /* settings */ |
| 142 | char *out_format_string; | 143 | char *out_format_string; |
| @@ -660,7 +661,12 @@ static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwct · 517 unmodified lines | |||
| 660 | } | 661 | } |
| 661 | 662 | ||
| 662 | /* Initialize inputs */ | 663 | /* Initialize inputs */ |
| 663 | RET(input_init(avctx, avctx->inputs[0], &s->input)); | 664 | s->nb_inputs = 1; |
| 665 | s->inputs = av_calloc(s->nb_inputs, sizeof(*s->inputs)); | ||
| 666 | if (!s->inputs) | ||
| 667 | return AVERROR(ENOMEM); | ||
| 668 | for (int i = 0; i < s->nb_inputs; i++) | ||
| 669 | RET(input_init(avctx, avctx->inputs[i], &s->inputs[i])); | ||
| 664 | 670 | ||
| 665 | /* fall through */ | 671 | /* fall through */ |
| 666 | fail: | 672 | fail: |
| @@ -677,7 +683,11 @@ static void libplacebo_uninit(AVFilterContext *avctx) · 10 unmodified lines | |||
| 677 | pl_tex_destroy(s->gpu, &s->tex[i]); | 683 | pl_tex_destroy(s->gpu, &s->tex[i]); |
| 678 | for (int i = 0; i < s->num_hooks; i++) | 684 | for (int i = 0; i < s->num_hooks; i++) |
| 679 | pl_mpv_user_shader_destroy(&s->hooks[i]); | 685 | pl_mpv_user_shader_destroy(&s->hooks[i]); |
| 680 | input_uninit(&s->input); | 686 | if (s->inputs) { |
| 687 | for (int i = 0; i < s->nb_inputs; i++) | ||
| 688 | input_uninit(&s->inputs[i]); | ||
| 689 | av_freep(&s->inputs); | ||
| 690 | } | ||
| 681 | pl_vulkan_destroy(&s->vulkan); | 691 | pl_vulkan_destroy(&s->vulkan); |
| 682 | pl_log_destroy(&s->log); | 692 | pl_log_destroy(&s->log); |
| 683 | ff_vk_uninit(&s->vkctx); | 693 | ff_vk_uninit(&s->vkctx); |
| @@ -774,7 +784,7 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) · 90 unmodified lines | |||
| 774 | { | 784 | { |
| 775 | int err = 0, ok, changed_csp; | 785 | int err = 0, ok, changed_csp; |
| 776 | LibplaceboContext *s = ctx->priv; | 786 | LibplaceboContext *s = ctx->priv; |
| 777 | LibplaceboInput *in = &s->input; | 787 | LibplaceboInput *in = &s->inputs[0]; |
| 778 | AVFilterLink *outlink = ctx->outputs[0]; | 788 | AVFilterLink *outlink = ctx->outputs[0]; |
| 779 | const AVPixFmtDescriptor *outdesc = av_pix_fmt_desc_get(outlink->format); | 789 | const AVPixFmtDescriptor *outdesc = av_pix_fmt_desc_get(outlink->format); |
| 780 | const AVFrame *ref = ref_frame(&in->mix); | 790 | const AVFrame *ref = ref_frame(&in->mix); |
| @@ -942,7 +952,7 @@ static int libplacebo_activate(AVFilterContext *ctx) · 161 unmodified lines | |||
| 942 | { | 952 | { |
| 943 | int ret; | 953 | int ret; |
| 944 | LibplaceboContext *s = ctx->priv; | 954 | LibplaceboContext *s = ctx->priv; |
| 945 | LibplaceboInput *in = &s->input; | 955 | LibplaceboInput *in = &s->inputs[0]; |
| 946 | AVFilterLink *outlink = ctx->outputs[0]; | 956 | AVFilterLink *outlink = ctx->outputs[0]; |
| 947 | int64_t pts; | 957 | int64_t pts; |
| 948 | 958 | ||