From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
Cc: Niklas Haas <git@haasn.dev>
Subject: [FFmpeg-devel] [PATCH v2 12/22] lavfi/vf_libplacebo: handle multiple inputs
Date: Sun, 18 Jun 2023 13:17:04 +0200
Message-ID: <20230618111955.40994-14-ffmpeg@haasn.xyz> (raw)
In-Reply-To: <20230618111955.40994-2-ffmpeg@haasn.xyz>
From: Niklas Haas <git@haasn.dev>
This commit still relies on a single input for PTS determination, to be
changed in the next commit.
---
libavfilter/vf_libplacebo.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 5ea6fcd7920..a56ebbf54e7 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -979,11 +979,13 @@ static int libplacebo_activate(AVFilterContext *ctx)
AVFilterLink *outlink = ctx->outputs[0];
int64_t pts;
- FF_FILTER_FORWARD_STATUS_BACK(outlink, in->link);
+ FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx);
pl_log_level_update(s->log, get_log_level());
- if ((ret = handle_input(ctx, in)) < 0)
- return ret;
+ for (int i = 0; i < s->nb_inputs; i++) {
+ if ((ret = handle_input(ctx, &s->inputs[i])) < 0)
+ return ret;
+ }
if (ff_outlink_frame_wanted(outlink)) {
if (s->fps.num) {
--
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-18 11:23 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-18 11:16 [FFmpeg-devel] lavfi/vf_libplacebo: generalize to " Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 01/22] lavfi/vf_libplacebo: drop redundant case Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 02/22] lavfi/vf_libplacebo: move input-specific state to struct Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 03/22] lavfi/vf_libplacebo: move input handling to separate function Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 04/22] lavfi/vf_libplacebo: cosmetic Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 05/22] lavfi/vf_libplacebo: move temporary vars into per-input struct Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 06/22] lavif/vf_libplacebo: remove pl_frame_mix from output_frame_mix Niklas Haas
2023-06-18 11:16 ` [FFmpeg-devel] [PATCH v2 07/22] lavfi/vf_libplacebo: factor out ref frame logic Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 08/22] lavfi/vf_libplacebo: use correct link in update_crops() Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 09/22] lavfi/vf_libplacebo: replace s->input by dynamic array Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 10/22] lavfi/vf_libplacebo: keep track of latest status globally Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 11/22] lavfi/vf_libplacebo: support blending multiple inputs Niklas Haas
2023-06-18 11:17 ` Niklas Haas [this message]
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 13/22] lavfi/vf_libplacebo: determine PTS of next frame from any input Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 14/22] lavfi/vf_libplacebo: only drain actually used PTS Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 15/22] lavfi/vf_libplacebo: generalize frame update to multiple inputs Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 16/22] lavfi/vf_libplacebo: make input-dependent vars dynamic Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 17/22] lavfi/vf_libplacebo: add in_idx variable Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 18/22] lavfi/vf_libplacebo: set format list for all inputs Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 19/22] lavfi/vf_libplacebo: skip cache selectively per-input Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 20/22] lavfi/vf_libplacebo: also skip cache if in FPS == out FPS Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 21/22] lavfi/vf_libplacebo: set time_base/frame_rate dynamically Niklas Haas
2023-06-18 11:17 ` [FFmpeg-devel] [PATCH v2 22/22] lavfi/vf_libplacebo: add nb_inputs option Niklas Haas
2023-06-20 14:50 ` [FFmpeg-devel] lavfi/vf_libplacebo: generalize to multiple inputs Marvin Scholz
2023-06-20 15:12 ` 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=20230618111955.40994-14-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