From: Niklas Haas <ffmpeg@haasn.xyz> To: ffmpeg-devel@ffmpeg.org Cc: Niklas Haas <git@haasn.dev> Subject: [FFmpeg-devel] [PATCH 17/22] lavfi/vf_libplacebo: add in_idx variable Date: Fri, 16 Jun 2023 11:29:54 +0200 Message-ID: <20230616092959.5247-17-ffmpeg@haasn.xyz> (raw) In-Reply-To: <20230616092959.5247-1-ffmpeg@haasn.xyz> From: Niklas Haas <git@haasn.dev> To allow placing an input dynamically, as a function of the input index. --- doc/filters.texi | 2 ++ libavfilter/vf_libplacebo.c | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index a46357bfd8..2ea4083c3e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16197,6 +16197,8 @@ the @option{crop_w}, @option{crop_h}, @option{crop_x}, @option{crop_y}, also contain the following constants: @table @option +@item in_idx, idx +The (0-based) numeric index of the currently active input stream. @item crop_w, cw @item crop_h, ch The computed values of @option{crop_w} and @option{crop_h}. diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index f86493f4e2..427a15dc47 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -70,6 +70,7 @@ enum { }; static const char *const var_names[] = { + "in_idx", "idx",///< index of input "in_w", "iw", ///< width of the input video frame "in_h", "ih", ///< height of the input video frame "out_w", "ow", ///< width of the output video frame @@ -92,6 +93,7 @@ static const char *const var_names[] = { }; enum var_name { + VAR_IN_IDX, VAR_IDX, VAR_IN_W, VAR_IW, VAR_IN_H, VAR_IH, VAR_OUT_W, VAR_OW, @@ -115,6 +117,7 @@ enum var_name { /* per-input dynamic filter state */ typedef struct LibplaceboInput { + int idx; pl_renderer renderer; pl_queue queue; enum pl_queue_status qstatus; @@ -574,7 +577,7 @@ static void unlock_queue(void *priv, uint32_t qf, uint32_t qidx) #endif static int input_init(AVFilterContext *avctx, AVFilterLink *link, - LibplaceboInput *input) + LibplaceboInput *input, int idx) { LibplaceboContext *s = avctx->priv; @@ -584,6 +587,7 @@ static int input_init(AVFilterContext *avctx, AVFilterLink *link, input->queue = pl_queue_create(s->gpu); input->renderer = pl_renderer_create(s->log, s->gpu); input->link = link; + input->idx = idx; return 0; } @@ -668,7 +672,7 @@ static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwct if (!s->inputs) return AVERROR(ENOMEM); for (int i = 0; i < s->nb_inputs; i++) - RET(input_init(avctx, avctx->inputs[i], &s->inputs[i])); + RET(input_init(avctx, avctx->inputs[i], &s->inputs[i], i)); /* fall through */ fail: @@ -739,6 +743,7 @@ static void update_crops(AVFilterContext *ctx, LibplaceboInput *in, double image_pts = src->pts * av_q2d(in->link->time_base); /* Update dynamic variables */ + s->var_values[VAR_IN_IDX] = s->var_values[VAR_IDX] = in->idx; s->var_values[VAR_IN_W] = s->var_values[VAR_IW] = in->link->w; s->var_values[VAR_IN_H] = s->var_values[VAR_IH] = in->link->h; s->var_values[VAR_A] = (double) in->link->w / in->link->h; -- 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:31 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 ` [FFmpeg-devel] [PATCH 11/22] lavfi/vf_libplacebo: support blending multiple inputs Niklas Haas 2023-06-16 9:29 ` [FFmpeg-devel] [PATCH 12/22] lavfi/vf_libplacebo: handle " 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 ` Niklas Haas [this message] 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-17-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