From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 437784687C for ; Sat, 22 Jul 2023 19:10:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D7E668C646; Sat, 22 Jul 2023 22:10:44 +0300 (EEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E619968C646 for ; Sat, 22 Jul 2023 22:10:37 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3fbc77e76abso24400225e9.1 for ; Sat, 22 Jul 2023 12:10:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1690053037; x=1690657837; h=content-transfer-encoding:mime-version:user-agent:in-reply-to :references:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SqlTU2m4S1U7u219A31pAJA3SmKd8KZ7LPwQXmP+y48=; b=jTL+jmflGpBXL08dvQJJloHQ5mzaMcesSD8AHNVW4CoUj5QoiLQTsv/d1wIFzsDKt6 Bi3KoPN5RJ8oED4ejwZ9Dw5iQVBubq/cLICyM93mplM8x+MKzIfoRvCqsJRkxq4prm+l ZlYiQJiLb11PkAqDsRSbmxy/Bq3qzTVxkv6FbgGUe692Xs08dr/eC2/HQo6nOjvukzS2 fQSKp6xEZYL2AQNIPeH7r458lvd7TzcyBoonuejCh82P3gs/PiEgVj7x/B//l6tcSNsT moKMjT8Pwl4tFhzjk6AuQ8PCGJREbKN16Lxc0kjPQsYeYru1GEDqQ69Q6MCr27W8LEqm Jidg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690053037; x=1690657837; h=content-transfer-encoding:mime-version:user-agent:in-reply-to :references:message-id:date:subject:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SqlTU2m4S1U7u219A31pAJA3SmKd8KZ7LPwQXmP+y48=; b=S7X0rmDbyBL2aPTcsj3PyGrRryS918I+GNHFgKNrnnNwlBNCQi4xPcF39aHTpz4KG1 cfnAgfX/joUKOClqWz0b8NyZNUNrcdYt2mXHOAWBZx3SVyI9qkAMx8FOP9WbYPaqa2xA R3is79Jttyho4YvWP5AuQzt28DSmiiPkul71S12jrNgzQ1jRvVKgsVcruh+ub4Q50qXt vRPwmKF4A1I+PNklNiVqe8LjVAeoEk9fkQe4mk2uOH+F/Wxq84trS9fXxVR+lliqLDlP YVbsOw05aHF92F2LmJcX/EQAi1jcNCUiYKBVUS1bdFl2w/L1P41rj9nX3YIxBUt0k1YN BStg== X-Gm-Message-State: ABy/qLa+EzCZCaKHBT//qMvQZWZEsXm90/tfi023vaY6UUcd1SZmaaHl v4LtuYdMdXJzxbzwKfAZP++eB8D2xHhm+BMnbYg= X-Google-Smtp-Source: APBJJlH2u5ZzkXMdfb7tv4Mlz14xOQVC3sXtiEgqIrnu6lyLEaKpKmS+KZT7UJhiRQt4w8u2jUVR1Q== X-Received: by 2002:a05:600c:21d4:b0:3f8:fc2a:c7eb with SMTP id x20-20020a05600c21d400b003f8fc2ac7ebmr4013346wmj.5.1690053037122; Sat, 22 Jul 2023 12:10:37 -0700 (PDT) Received: from CTHALPA.outer.uphall.net (cpc1-cmbg20-2-0-cust759.5-4.cable.virginm.net. [86.21.218.248]) by smtp.gmail.com with ESMTPSA id o1-20020a05600c378100b003fbd9e390e1sm8598836wmr.47.2023.07.22.12.10.36 for (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sat, 22 Jul 2023 12:10:36 -0700 (PDT) From: John Cox To: FFmpeg development discussions and patches Date: Sat, 22 Jul 2023 20:10:36 +0100 Message-ID: References: <20230722164157.964161-1-jc@kynesim.co.uk> <20230722164157.964161-2-jc@kynesim.co.uk> In-Reply-To: User-Agent: ForteAgent/8.00.32.1272 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2 1/1] avfilter/buffersink: Add video frame allocation callback X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sat, 22 Jul 2023 20:54:04 +0200, you wrote: >On 22 Jul 2023, at 18:41, John Cox wrote: > >> Add a callback to enable user allocation of video frames on the final >> stage of a filter chain. >> >> Signed-off-by: John Cox >> --- >> libavfilter/buffersink.c | 21 +++++++++++++++++++++ >> libavfilter/buffersink.h | 27 +++++++++++++++++++++++++++ >> libavfilter/version.h | 2 +- >> 3 files changed, 49 insertions(+), 1 deletion(-) >> >> diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c >> index 306c283f77..070b743186 100644 >> --- a/libavfilter/buffersink.c >> +++ b/libavfilter/buffersink.c >> @@ -62,6 +62,11 @@ typedef struct BufferSinkContext { >> int sample_rates_size; >> >> AVFrame *peeked_frame; >> + >> + union { >> + av_buffersink_alloc_video_frame * video; >> + } alloc_cb; >> + void * alloc_v; >> } BufferSinkContext; >> >> #define NB_ITEMS(list) (list ## _size / sizeof(*list)) >> @@ -154,6 +159,21 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, >> return get_frame_internal(ctx, frame, 0, nb_samples); >> } >> >> +static AVFrame * alloc_video_buffer(AVFilterLink *link, int w, int h) >> +{ >> + AVFilterContext * const ctx = link->dst; >> + BufferSinkContext * const bs = ctx->priv; >> + return bs->alloc_cb.video ? bs->alloc_cb.video(ctx, bs->alloc_v, w, h) : >> + ff_default_get_video_buffer(link, w, h); >> +} >> + >> +void av_buffersink_set_alloc_video_frame(AVFilterContext *ctx, av_buffersink_alloc_video_frame * cb, void * v) >> +{ >> + BufferSinkContext * const bs = ctx->priv; >> + bs->alloc_cb.video = cb; >> + bs->alloc_v = v; >> +} >> + >> static av_cold int common_init(AVFilterContext *ctx) >> { >> BufferSinkContext *buf = ctx->priv; >> @@ -381,6 +401,7 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = { >> { >> .name = "default", >> .type = AVMEDIA_TYPE_VIDEO, >> + .get_buffer = {.video = alloc_video_buffer}, >> }, >> }; >> >> diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h >> index 64e08de53e..73f0ddc476 100644 >> --- a/libavfilter/buffersink.h >> +++ b/libavfilter/buffersink.h >> @@ -166,6 +166,33 @@ int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame); >> */ >> int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples); >> >> +/** >> + * Callback from av_buffersink_set_alloc_video_frame to allocate >> + * a frame >> + * >> + * @param ctx pointer to a context of the abuffersink AVFilter. >> + * @param v opaque pointer passed to >> + * av_buffersink_set_alloc_video_frame > >Nit: > >You can use @ref av_buffersink_set_alloc_video_frame or even >shorter ::av_buffersink_set_alloc_video_frame to get a proper >reference to that function that will be linked. Thanks - will do - Is documentation built from this? I had a quick look to see if I could find some output to verify what I'd done but I failed to find it. >> + * @param w width of frame to allocate >> + * @param height of frame to allocate >> + * >> + * @return >> + * - The newly allocated frame >> + * - NULL if error > >Nit: > >This can use retval, for example like that: > >@retval AVFrame* The newly allocated frame >@retval NULL Error allocating the frame Will do. Ta JC >> + */ >> +typedef AVFrame * av_buffersink_alloc_video_frame(AVFilterContext * ctx, void * v, int w, int h); >> + >> +/** >> + * Set a video frame allocation method for buffersink >> + * >> + * @param ctx pointer to a context of the abuffersink AVFilter. >> + * @param cb Callback to the allocation function. If set to NULL >> + * then the default avfilter allocation function will >> + * be used. >> + * @param v Opaque to pass to the allocation function >> + */ >> +void av_buffersink_set_alloc_video_frame(AVFilterContext *ctx, av_buffersink_alloc_video_frame * cb, void * v); >> + >> /** >> * @} >> */ >> diff --git a/libavfilter/version.h b/libavfilter/version.h >> index c001693e3c..54950497be 100644 >> --- a/libavfilter/version.h >> +++ b/libavfilter/version.h >> @@ -31,7 +31,7 @@ >> >> #include "version_major.h" >> >> -#define LIBAVFILTER_VERSION_MINOR 8 >> +#define LIBAVFILTER_VERSION_MINOR 9 >> #define LIBAVFILTER_VERSION_MICRO 102 >> >> >> -- >> 2.39.2 >> >> _______________________________________________ >> 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". >_______________________________________________ >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". _______________________________________________ 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".