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 99F4D42397 for ; Tue, 15 Mar 2022 10:49:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D0B268B0B9; Tue, 15 Mar 2022 12:49:44 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA8DA68B187 for ; Tue, 15 Mar 2022 12:49:36 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6A67A240179 for ; Tue, 15 Mar 2022 11:49:36 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 5AGWIU5KMrU6 for ; Tue, 15 Mar 2022 11:49:35 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 75FCC2400F5 for ; Tue, 15 Mar 2022 11:49:35 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 5F8D33A0406; Tue, 15 Mar 2022 11:49:35 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 11:49:31 +0100 Message-Id: <20220315104932.25496-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/threadframe: allow decoders to attach buffers to ThreadFrame 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: This may be useful for synchronizing side data that only becomes available after ff_thread_finish_setup() is called. --- libavcodec/pthread_frame.c | 1 + libavcodec/threadframe.h | 3 +++ libavcodec/utils.c | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 33b5a2e628..4da3832942 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -1138,6 +1138,7 @@ fail: void ff_thread_release_ext_buffer(AVCodecContext *avctx, ThreadFrame *f) { av_buffer_unref(&f->progress); + av_buffer_unref(&f->priv_buf); f->owner[0] = f->owner[1] = NULL; ff_thread_release_buffer(avctx, f->f); } diff --git a/libavcodec/threadframe.h b/libavcodec/threadframe.h index dea4dadc6d..c2ddc2969f 100644 --- a/libavcodec/threadframe.h +++ b/libavcodec/threadframe.h @@ -30,6 +30,9 @@ typedef struct ThreadFrame { // progress->data is an array of 2 ints holding progress for top/bottom // fields AVBufferRef *progress; + + /* arbitrary user data propagated along with the frame */ + AVBufferRef *priv_buf; } ThreadFrame; /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 066da76e16..cc2c2715b3 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -881,6 +881,12 @@ int ff_thread_ref_frame(ThreadFrame *dst, const ThreadFrame *src) return AVERROR(ENOMEM); } + if (src->priv_buf) { + dst->priv_buf = av_buffer_ref(src->priv_buf); + if (!dst->priv_buf) + return AVERROR(ENOMEM); + } + return 0; } @@ -913,6 +919,7 @@ void ff_thread_release_ext_buffer(AVCodecContext *avctx, ThreadFrame *f) f->owner[0] = f->owner[1] = NULL; if (f->f) av_frame_unref(f->f); + av_buffer_unref(&f->priv_buf); } void ff_thread_finish_setup(AVCodecContext *avctx) -- 2.34.1 _______________________________________________ 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".