From patchwork Tue Mar 15 10:49:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 34753 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2896161nkb; Tue, 15 Mar 2022 03:49:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbCV8pY06atM86XgZofbTlcewt2T7uQ9NN2m+991LFx+KQgCdNkAe6EuCWkkmeee3Tw1Rp X-Received: by 2002:a17:907:d04:b0:6db:56be:ef8 with SMTP id gn4-20020a1709070d0400b006db56be0ef8mr23561849ejc.188.1647341399287; Tue, 15 Mar 2022 03:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647341399; cv=none; d=google.com; s=arc-20160816; b=wPq14KX55Yan3Y25ChYg+UfcIG8RCC7ccDSdyqf9IocGClMF1r4vBoUI7HVErQv8e1 oGFQ2JP2a6hh9UVeXKeufyUYUkOJmsqOwxZbzpl9I4LUhkxUsWPxd/qf8et4ViF8goRj 4vx/34U5VSGq5lX17cGISd4H99YZBSj1Dp7H4rKrnOtK4FnXK2OXt30Y7ApTkMP4pa7u fp0Rtbv+MWK5MV7mlGTNI1rGLqCm7i9cQLiN/a+Z5mcUJxsaTDfdYWQCpBfGPk/HgsIj ebpI0wMTP2EXBohUKKcVWcotAesN4cCwH0UTzVJApOWDAwVu/xKrSYZclFdwiVoDKL9P Ubdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=juW211YnK86MUvsMPd/YXXA/PN5qfr8ybFUF70fc+x8=; b=vn72daEUt7eoAdisbqFI7jiBkERXppIO38GX57PNHY0mGQhT8ZnuwinAYYWQkVHzBv NfmJX+C+Eqn77h81CcTyf3uFFcg+DRnvXpzOYuVKAzaH8KBW69CJNStE5RsdemcTDCIO sZM+GhhE8YK4Sx2Ty1ca/d00BgBt1ZvcluVE3hI6XQuKrNK5Tvlralw74tSOXbNc/uCh e1WFjJgE1ogyeI/I0uFG2CFKfDEMNYeQNTgNm055NrdthetSmFUn7OReQy7ZLB/n2A6C y7zJJ/so/5kzELCK6LzrGykWTMmiK3PgM9+cpGT37i4/nYiBjakwldjGrcLirGPOBOwX UhrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b11-20020a1709064d4b00b006a7342dba45si10309253ejv.192.2022.03.15.03.49.58; Tue, 15 Mar 2022 03:49:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63E3168B19C; Tue, 15 Mar 2022 12:49:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jR5pisQPxAK0 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)