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 F402246F15 for ; Sat, 22 Jul 2023 16:45:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E3C168C600; Sat, 22 Jul 2023 19:45:22 +0300 (EEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7ADF668BFE2 for ; Sat, 22 Jul 2023 19:45:16 +0300 (EEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3fd190065a7so23924795e9.2 for ; Sat, 22 Jul 2023 09:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kynesim-co-uk.20221208.gappssmtp.com; s=20221208; t=1690044316; x=1690649116; 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=CTe/fHVEYnsVE9ogG+M6nPvVznCpaAuYqhwkdQukkNI=; b=V/mCEmEOQmYgL3rIMumxQOXBQiaFULFTm2rvhLO7BxOoc6giWfG+LotdcYhZZrpyQs WWb5RZBsJX5NGnqXdZHMVRf9JXE9F0jnmyCC45Kv5oMKKhgFln5tYlAqINsi+0H24Ry9 nzZqMThMyitxEdgO50bsYw3ZR77PikjEiYyT9KFnuGQ5bwJldx+QPkeVTEw95+e72pyW 1ijzBKMSpsEWY+LkFGP0+QNx0t02xsU7ZnYQY1hEhVU2ChFspTD2xexTSxB0h4ScEcgj O3K19cgmLuaUzLbOUesjAv0Z+MX8Qi8O1JvpPpLkbtZcrAz7xzAqdWOGlRtGkVBpW2jM F6gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690044316; x=1690649116; 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=CTe/fHVEYnsVE9ogG+M6nPvVznCpaAuYqhwkdQukkNI=; b=KJ1gPdSvdrI20U6DpJ2dHoF4+MrG0oNrXx9pTOr+HPn6Tpr2eDJXRX0zsJXtDhVimY QKS9fTAeIUCrgW+2LZH1Q8MnlUQw//3ZFXvppYjKeQ6FLDbiItP27qBgWKj+b7PaPD+2 Yac2JOAQr/lb6T7at0PxyFa1k/0ZfyaGyBsuxtwCb1Bw3jnnMPzA3ML/8DpPYEtqbgsY awSt3BPEVoJZXoP91+QB+yQhJJTiOhsssXrQ2TDUccFZJsgkfXszJLO6pImgJoRnoNxl b5JZklljZPbCRRr8btxAQiVrIke6BHHiIn7qziwuFnaGsImgrVOzToyKKHYpLiLo+7fW DRSw== X-Gm-Message-State: ABy/qLaEWMV1ARTln+B1UPEmj4wO6uhiUFK1GZqewOKCJEyS1bAJOMtc u1DXTGY6UynNesoN+Z1LBdfZpA== X-Google-Smtp-Source: APBJJlEqtHe9RDe2HZhbTYG2vzDwEqMym/eyxFj2Cy2GB582TPaGUU0E4Oz1Zo5OTneIaTQEMLeYcQ== X-Received: by 2002:a05:600c:2259:b0:3fb:adc0:609b with SMTP id a25-20020a05600c225900b003fbadc0609bmr3993379wmm.13.1690044315863; Sat, 22 Jul 2023 09:45:15 -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 m5-20020a7bce05000000b003fbc9d178a8sm8434292wmc.4.2023.07.22.09.45.15 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Sat, 22 Jul 2023 09:45:15 -0700 (PDT) From: John Cox To: John Cox Date: Sat, 22 Jul 2023 17:45:15 +0100 Message-ID: References: <20230722164157.964161-1-jc@kynesim.co.uk> <20230722164157.964161-2-jc@kynesim.co.uk> In-Reply-To: <20230722164157.964161-2-jc@kynesim.co.uk> 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 Cc: stefasab@gmail.com, george@nsup.org, ffmpeg-devel@ffmpeg.org 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: Finger trouble - repost of previous patch - please ignore Sorry JC >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 >+ * @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); >+ >+/** >+ * 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 > > _______________________________________________ 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".