From: Niklas Haas <ffmpeg@haasn.xyz> To: ffmpeg-devel@ffmpeg.org Cc: Niklas Haas <git@haasn.dev> Subject: [FFmpeg-devel] [PATCH 11/22] lavfi/vf_libplacebo: support blending multiple inputs Date: Fri, 16 Jun 2023 11:29:48 +0200 Message-ID: <20230616092959.5247-11-ffmpeg@haasn.xyz> (raw) In-Reply-To: <20230616092959.5247-1-ffmpeg@haasn.xyz> From: Niklas Haas <git@haasn.dev> Subsequent inputs required frame blending to be enable, in order to not overwrite the existing frame contents. For output metadata, we implicitly copy the metadata of the *first* available stream (falling back to the second stream if the first has already reached EOF, and so on). This is done to resolve any conflicts between inputs with differing metadata. So when e.g. input 1 is HDR and output 2 is SDR, the output will be HDR, and vice versa. This logic could probablly be improved by dynamically determining some "superior" set of metadata, but I don't want to handle that complexity in this series. --- libavfilter/vf_libplacebo.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index d6f19f166d..3d812569f1 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -784,12 +784,18 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) { int err = 0, ok, changed_csp; LibplaceboContext *s = ctx->priv; - LibplaceboInput *in = &s->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; const AVPixFmtDescriptor *outdesc = av_pix_fmt_desc_get(outlink->format); - const AVFrame *ref = ref_frame(&in->mix); struct pl_frame target; + const AVFrame *ref = NULL; AVFrame *out; + + /* Use the first active input as metadata reference */ + for (int i = 0; i < s->nb_inputs; i++) { + const LibplaceboInput *in = &s->inputs[i]; + if (in->qstatus == PL_QUEUE_OK && (ref = ref_frame(&in->mix))) + break; + } if (!ref) return 0; @@ -860,8 +866,18 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) goto fail; } - update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base)); - pl_render_image_mix(in->renderer, &in->mix, &target, &s->params); + /* Draw first frame opaque, others with blending */ + s->params.skip_target_clearing = false; + s->params.blend_params = NULL; + for (int i = 0; i < s->nb_inputs; i++) { + LibplaceboInput *in = &s->inputs[i]; + if (in->qstatus != PL_QUEUE_OK) + continue; + update_crops(ctx, in, &target, out->pts * av_q2d(outlink->time_base)); + pl_render_image_mix(in->renderer, &in->mix, &target, &s->params); + s->params.skip_target_clearing = true; + s->params.blend_params = &pl_alpha_overlay; + } if (outdesc->flags & AV_PIX_FMT_FLAG_HWACCEL) { pl_unmap_avframe(s->gpu, &target); -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-06-16 9:32 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-16 9:29 [FFmpeg-devel] [PATCH 01/22] lavfi/vf_libplacebo: drop redundant case Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 02/22] lavfi/vf_libplacebo: move input-specific state to struct Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 03/22] lavfi/vf_libplacebo: move input handling to separate function Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 04/22] lavfi/vf_libplacebo: cosmetic Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 05/22] lavfi/vf_libplacebo: move temporary vars into per-input struct Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 06/22] lavif/vf_libplacebo: remove pl_frame_mix from output_frame_mix Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 07/22] lavfi/vf_libplacebo: factor out ref frame logic Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 08/22] lavfi/vf_libplacebo: use correct link in update_crops() Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 09/22] lavfi/vf_libplacebo: replace s->input by dynamic array Niklas Haas 2023-06-16 12:09 ` Andreas Rheinhardt 2023-06-16 12:22 ` Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 10/22] lavfi/vf_libplacebo: keep track of latest status globally Niklas Haas 2023-06-16 9:29 ` Niklas Haas [this message] 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 12/22] lavfi/vf_libplacebo: handle multiple inputs Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 13/22] lavfi/vf_libplacebo: determine PTS of next frame from any input Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 14/22] lavfi/vf_libplacebo: only drain actually used PTS Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 15/22] lavfi/vf_libplacebo: generalize frame update to multiple inputs Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 16/22] lavfi/vf_libplacebo: make input-dependent vars dynamic Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 17/22] lavfi/vf_libplacebo: add in_idx variable Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 18/22] lavfi/vf_libplacebo: set format list for all inputs Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 19/22] lavfi/vf_libplacebo: skip cache selectively per-input Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 20/22] lavfi/vf_libplacebo: also skip cache if in FPS == out FPS Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 21/22] lavfi/vf_libplacebo: set time_base/frame_rate dynamically Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 22/22] lavfi/vf_libplacebo: add nb_inputs option Niklas Haas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230616092959.5247-11-ffmpeg@haasn.xyz \ --to=ffmpeg@haasn.xyz \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=git@haasn.dev \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git