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 876D046F11 for ; Sat, 22 Jul 2023 15:50:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 607E768C59C; Sat, 22 Jul 2023 18:50:42 +0300 (EEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0754768C2B9 for ; Sat, 22 Jul 2023 18:50:35 +0300 (EEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3fc02a92dcfso24009325e9.0 for ; Sat, 22 Jul 2023 08:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1690041035; x=1690645835; h=content-transfer-encoding:mime-version:user-agent:in-reply-to :references:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=UdtH4xVMAP7amqOVF7dz+en3m2qw5kSOppWzeaBPLBU=; b=VZMchmGY83EWxGpFCh2JYn1V283gkt3dAN/8MzZt9vkAC1BucUSA3bzLh8OEYzOKjb 2S/wnQmGA7Pv9w+SMcJM2IIGy44m51WoQOc5ZTWhsL/c1ePL/uvbFvVatSpg23qBpzjb pojbPkB1DPd7DLDGpUOivs4nLD6LKK3zIOM0W7/01SVo2SmB6VRioB53K2lCOxu9MkdL WK3F0oRU1ns4Io4Z2WdyMUK8HYyrCmJti+udevqsw0elXsWsQbSRe2f6dEfKRVvouvgs cowPcn71wzBVPxqlLJw+NX0IUfvgNOBhlkeOxvHgz8vaOQ7DCI2A0800ZPvKBbUB1Mlf fjRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690041035; x=1690645835; h=content-transfer-encoding:mime-version:user-agent:in-reply-to :references:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UdtH4xVMAP7amqOVF7dz+en3m2qw5kSOppWzeaBPLBU=; b=aWp00C6ERSdfBvWbi5YLepunMiaoHqULsi+XWkRHeA8ITglPJg8A2OtHDl9VzaYicJ IFpGekGuZfA/j0Mq2EhYwr2I6c0ROLZXmCFCbDqVp/db+wSkzfWzhcmTtQ5A6tfHj567 o2Ewc9QeNIc8BPbPALDO4X8hTl924D5dBTjy9eoUFkRONIF2oAGrENS1AUdQBM9QnAAK sw9LEec8+3l1MxRiF3LEGNFdnfJwa5XJPwM8GnVoatBDHtRZ8rMmjJqrr58MGCW4OsZF +cc0842kdlr2x3ezcf6bNEsJLbs92pCkuZJTY16ikuL1O4EdN1f7rsqMbY2WyLsXZ6q7 wofQ== X-Gm-Message-State: ABy/qLYeEgPODHmvdurT+u6/qBWozQMfnN1XlihDyZ1udovCQsDx5X/j Y44kH0OIF4qwAS+bNa7tkfOYepfWhFyGwny2wfc= X-Google-Smtp-Source: APBJJlHb+cAe6+4/Ccs4VgGL3iPEO/JB//SIq4h/GR0RcQ6NK+M8g7q0pmOdSm50eu9QRKVj0KKztw== X-Received: by 2002:a7b:c01a:0:b0:3f9:c986:a2ca with SMTP id c26-20020a7bc01a000000b003f9c986a2camr3782294wmb.24.1690041034922; Sat, 22 Jul 2023 08:50:34 -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 u9-20020a7bc049000000b003fba6a0c881sm8245204wmc.43.2023.07.22.08.50.34 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sat, 22 Jul 2023 08:50:34 -0700 (PDT) From: John Cox To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jul 2023 16:50:34 +0100 Message-ID: <25tnbipkk9r9sf5vsfpej7b6u1tfdv9rjr@4ax.com> References: <20230720113955.957942-1-jc@kynesim.co.uk> <20230720113955.957942-2-jc@kynesim.co.uk> In-Reply-To: User-Agent: ForteAgent/8.00.32.1272 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 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 Cc: stefasab@gmail.com, Nicolas George 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: Hi On Sat, 22 Jul 2023 17:12:51 +0200, you wrote: >John Cox (12023-07-20): >> 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(-) > >Hi. > >Thanks for the patch. Thanks for the prompt attention >> >> 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; > >Here and everywhere: our coding style puts a space before the * but not >after. Will fix >> } 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; > >Nit: it is called buf in the rest of this file. Will fix >> + return bs->alloc_cb.video ? bs->alloc_cb.video(ctx, bs->alloc_v, w, h) : >> + ff_default_get_video_buffer(link, w, h); > >Nit: align ff_ with bs->. Will fix >> +} >> + >> +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 >> + * @param w width of frame to allocate >> + * @param height of frame to allocate >> + * >> + * @return >> + * - The newly allocated frame >> + * - NULL if error >> + */ > >> +typedef AVFrame * av_buffersink_alloc_video_frame(AVFilterContext * ctx, void * v, int w, int h); > >In the rest of the API, function typedefs are always pointer-to-function >typedefs. Fair enough - I've found it convient in the past to be able to use the function typedef for prototypes of the functions too. >Also, I find this typedef looks too much like actually a function, maybe >use CamelCase. Will do >> + >> +/** >> + * 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 > >A test program would be nice too. I assume you have something to test >your code: would it be a lot of work to make it public? Actually my only test code is Kodi (xbmc) on Pi which is already using it. The patch is simple enough that I didn't feel the need for a separate test. I can put something together if required though. Regards JC _______________________________________________ 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".