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 C7790468A6 for ; Sun, 23 Jul 2023 08:23:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD88F68C699; Sun, 23 Jul 2023 11:23:15 +0300 (EEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8D4468C4AB for ; Sun, 23 Jul 2023 11:23:09 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-307d20548adso2288788f8f.0 for ; Sun, 23 Jul 2023 01:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1690100589; x=1690705389; 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=JTpTZX6BqoZ7qlSUBZr6LOeJ2USVJAgFpEnnl+1fB04=; b=BJ2Xyf6omiy0wwBcThnpzummYdKWidquREALmpNdeZBOtjoX7epoVEQMueB6+0a94G jN3xBOUucYgp4J0VgsVAnt2lA+5z20nkGShmVU0msbiZZf2kJUpnsSgFzcgcBb8NvjT/ fxGr15tQFHNjr/UKFrpma+azRZwvRj3sa21vaF5hv01BL3tSy7ScC649GRnOkyuOkcsw tDgst2tsAQRc9izZ12gWKVHUa7hyXObE46+pgAL2iTsEUTQMWyyCIhtDm+weOMr4r1uh x5jF3eojYWy8IN32ts3BFbd1TqHYpJH9rMd/a4EVzih9AJj1cm98hBOMuaGrPouQZMuf hxtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690100589; x=1690705389; 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=JTpTZX6BqoZ7qlSUBZr6LOeJ2USVJAgFpEnnl+1fB04=; b=VxdE/1VpMfd/JU1Vne7Tn8X3MBV/jnh+48yoUJWdgz0nYcXyxXkRp6T57id67FhbN+ 0O4Pv8gI9cNUGtb4u1b9knqLf50wJWJ6wNGYECkynPzpNWTFHibLDKssdY2Th3z/X6d4 dgVYMvn3JPus54/45HZAlUa/JroRSNGFBiE2yOJ0e3bIBajzbQS9wU5d0Q8jbC01I/0a +4/2FwllHzACTZZrnIltvz1Lzqpmm5METzs/o8pUy5Uh3DpJ5FKZ/Ph9UGcYd3CJyHHv SbpXIhjisIkZbCyiFZLyTCaz16BoEn8soCAlrFwQMJpI+A3t1laPDuYKkbT2+Y3w3VTX HcgA== X-Gm-Message-State: ABy/qLaDBtQQk1PfA7+RfVg7tYZDXy9mGpBLeBQCwZkPdjqOKVPMlvH9 M9cICowEtFSOQE3M40dlMXq9bFfPApPK3gWP2kk= X-Google-Smtp-Source: APBJJlEvCZ7oTzJCrZRNC3IjX2cj/hg2PGmjyUX6fOZ1KyD3vPsAJQlouCbicG6SDOLLvBVxKYbxCQ== X-Received: by 2002:a5d:53d0:0:b0:313:f33c:24c4 with SMTP id a16-20020a5d53d0000000b00313f33c24c4mr3662821wrw.39.1690100588566; Sun, 23 Jul 2023 01:23:08 -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 y9-20020a5d4709000000b003143801f8d8sm8970788wrq.103.2023.07.23.01.23.08 for (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sun, 23 Jul 2023 01:23:08 -0700 (PDT) From: John Cox To: FFmpeg development discussions and patches Date: Sun, 23 Jul 2023 09:23:07 +0100 Message-ID: References: <20230722170357.964313-1-jc@kynesim.co.uk> <20230722170357.964313-2-jc@kynesim.co.uk> In-Reply-To: User-Agent: ForteAgent/8.00.32.1272 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v3 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 21:14:24 +0200, you wrote: >John Cox: >> 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..e99d444530 100644 >> --- a/libavfilter/buffersink.c >> +++ b/libavfilter/buffersink.c >> @@ -62,6 +62,11 @@ typedef struct BufferSinkContext { >> int sample_rates_size; >> >> AVFrame *peeked_frame; >> + >> + union { >> + AVBuffersinkAllocVideoFrameFunc 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 buf = ctx->priv; >> + return buf->alloc_cb.video ? buf->alloc_cb.video(ctx, buf->alloc_v, w, h) : >> + ff_default_get_video_buffer(link, w, h); >> +} >> + >> +void av_buffersink_set_alloc_video_frame(AVFilterContext *ctx, AVBuffersinkAllocVideoFrameFunc cb, void *v) >> +{ >> + BufferSinkContext *const buf = ctx->priv; >> + buf->alloc_cb.video = cb; >> + buf->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..2419d1bd80 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 *(*AVBuffersinkAllocVideoFrameFunc)(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, AVBuffersinkAllocVideoFrameFunc 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 > >Not commenting on the actual patch, but when bumping minor, you need to >reset micro. To zero? or one? (I'm guessing 0) Ta 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".