From patchwork Wed Aug 11 01:48:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp971980iod; Tue, 10 Aug 2021 18:49:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjO0DAdJymn6TgBaHSqG0lMFvKlf1ItNKQ6UlpQKJT3tLRRiMtrZiykHBZ8mzgDxgy6PJD X-Received: by 2002:a17:906:388b:: with SMTP id q11mr1253038ejd.113.1628646563135; Tue, 10 Aug 2021 18:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628646563; cv=none; d=google.com; s=arc-20160816; b=zcDvenjBtq8A9oHgMtAQ/Y5eVcjJtQuI9ogZGm0muExSmX5AMLG5Vou/9SspXXDEME dkeDaiGJ6sm/IHZEqj+GkO9DD/m+/Wnv2FjufFeqahEplM5gcgEV4xdfgUjN1OB9jCEF IRoRx+lw04N1ucTSrQdvXPEyXCEjBdw4KgycQAqGFozbWoLemFXQEG72++GcGGwZuhrm AnIdMgbvNR8YYe4eow92CZ/zLSRV43d9/aUu4JvnPLWx+HUB5a3hHbZ++kdrPrEbg6cS kZSAAUZmOuKp8Hlsl9ERZMuVUnqCZ1Gh+quCYICwigCJdFQ3Y8ILiO5TPe/Wf5gATgFK /Wpg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Tt+pyyVWMsyr8oLUQ72U3tX3Im6LiH2XwbFk6c26GP8=; b=vQZx/6MlBADHqCZ5DBOkExr37DJrcKjSJz0hvyraJC/YcpxfprHo6PheMt52LMCX4/ 68hMaFbRbBFl+ouooKx+a7+HjVLPFtgFPDqpAKjpfeS1fPl7c40676Bz3RDMkAZbaApi TTsFXLdfEBpqTkyw+tfRhlGNsow+iiJkgUXrBaUb+g5rAHNgMLRe/VjLZ1pKZ1I2Y6oT 0k8xJqrtrUxPZAmt6YaFhAz0IgVKAv9QQVKnqbuJhgC2UvNx0qatHdVO+R3lX5BeuPKv Nblxw/B3K0MO7NL5jWgMf8boCoHB0rAFANJpXM+0tdd7n3yCtzcxOPi4lgNwnqjnQ1aE 7Jew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Iy3vBYos; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r7si21320105edo.180.2021.08.10.18.49.22; Tue, 10 Aug 2021 18:49:23 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Iy3vBYos; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD5CA68A242; Wed, 11 Aug 2021 04:49:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28F0B689C7E for ; Wed, 11 Aug 2021 04:49:13 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id b7so579105plh.7 for ; Tue, 10 Aug 2021 18:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=mbCTrc7tTlHDJ0Vah691d7MN3082bgmz5IvfgOcDB+o=; b=Iy3vBYosU98dWfom8yprzjtAoxNjEkE1HQ4kMgKaWTW84FGyG74oDAA8f+fdrWiK3/ /SUEJM8BerGcN/BlPJP6b1vk/3icbYc+dfmFO4PLfN0tLyZLIcnWANx4jo7OcLiwMvWh BQcoZAsDwxJEVuKup/xqjBS9NTDncqzje4nRscaOZezZMF1FMHqr16t3UEW6TlW5D8ou PZkt0z/3gOu7qq4c5sYBK++Oe/ATawqXbLH07kz5hROriBk4W7V+d3KLho0VRoN7N44B 3F5lDoqXakRbX6gQLl51jHSRIaHnb9kya/XjaC4MQMDEcRdHQHaHOGIzkokDlIjbTcfy I6iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mbCTrc7tTlHDJ0Vah691d7MN3082bgmz5IvfgOcDB+o=; b=nIndgvik2iRszAck3Zw5bKhMOUmATz8MRdskEfgHOeedHr92/rw4Y8UQa04keHju9y NfM4lAM1OlLNsWjvpVIhai5VZW3uFhletzmJOoN7tOxhH/rcTsY8sh++wo9rYKn4m5+h bInIqXEZKjhWyWJfI6M3On02NhZY8GWU3q9wYf/QYisZcmicTaGVCPSESI8M28yzd2R5 D2/km8Pv/zSi8nXC+EZDGUz0HZfnxO6Up870FHG6PXEL5H8r2CJRmVm3UYpwMzX8MgWJ BfKI4rEsK3iDK3ZhsQ83tM1KEP8zai5kR0odFkpqpaPf58dnWOrPSO91NP+xwTrEcf2H 70tQ== X-Gm-Message-State: AOAM530iIqFAAmuUebNyX4ZsbeoPocNP0gIqP4AvAZMx9ThFZXwBHpQ7 Ypv/OpgMeHU7tO0itAoBV24mKbOGGSg= X-Received: by 2002:a17:902:9a46:b029:12c:9aae:daac with SMTP id x6-20020a1709029a46b029012c9aaedaacmr27441374plv.78.1628646550844; Tue, 10 Aug 2021 18:49:10 -0700 (PDT) Received: from localhost.localdomain ([191.84.233.71]) by smtp.gmail.com with ESMTPSA id f4sm30723158pgi.68.2021.08.10.18.49.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 18:49:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 22:48:57 -0300 Message-Id: <20210811014857.16493-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810220001.13494-1-jamrial@gmail.com> References: <20210810220001.13494-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/vp9: use ff_thread_replace_frame() 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: BWScaJBFbHvE Signed-off-by: James Almer --- libavcodec/vp9.c | 67 ++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 874005a5ae..85f44b9d8c 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -186,6 +186,35 @@ fail: return AVERROR(ENOMEM); } +static int vp9_frame_replace(AVCodecContext *avctx, VP9Frame *dst, VP9Frame *src) +{ + int ret; + + ret = ff_thread_replace_frame(avctx, &dst->tf, &src->tf); + if (ret < 0) + return ret; + + ret = av_buffer_replace(&dst->extradata, src->extradata); + if (ret < 0) + goto fail; + + dst->segmentation_map = src->segmentation_map; + dst->mv = src->mv; + dst->uses_2pass = src->uses_2pass; + + ret = av_buffer_replace(&dst->hwaccel_priv_buf, src->hwaccel_priv_buf); + if (ret < 0) + goto fail; + + dst->hwaccel_picture_private = src->hwaccel_picture_private; + + return 0; + +fail: + vp9_frame_unref(avctx, dst); + return ret; +} + static int update_size(AVCodecContext *avctx, int w, int h) { #define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + \ @@ -1574,10 +1603,8 @@ static int vp9_decode_frame(AVCodecContext *avctx, void *frame, ((AVFrame *)frame)->pts = pkt->pts; ((AVFrame *)frame)->pkt_dts = pkt->dts; for (i = 0; i < 8; i++) { - if (s->next_refs[i].f->buf[0]) - ff_thread_release_buffer(avctx, &s->next_refs[i]); - if (s->s.refs[i].f->buf[0] && - (ret = ff_thread_ref_frame(&s->next_refs[i], &s->s.refs[i])) < 0) + ret = ff_thread_replace_frame(avctx, &s->next_refs[i], &s->s.refs[i]); + if (ret < 0) return ret; } *got_frame = 1; @@ -1614,12 +1641,10 @@ static int vp9_decode_frame(AVCodecContext *avctx, void *frame, // ref frame setup for (i = 0; i < 8; i++) { - if (s->next_refs[i].f->buf[0]) - ff_thread_release_buffer(avctx, &s->next_refs[i]); if (s->s.h.refreshrefmask & (1 << i)) { - ret = ff_thread_ref_frame(&s->next_refs[i], &s->s.frames[CUR_FRAME].tf); - } else if (s->s.refs[i].f->buf[0]) { - ret = ff_thread_ref_frame(&s->next_refs[i], &s->s.refs[i]); + ret = ff_thread_replace_frame(avctx, &s->next_refs[i], &s->s.frames[CUR_FRAME].tf); + } else { + ret = ff_thread_replace_frame(avctx, &s->next_refs[i], &s->s.refs[i]); } if (ret < 0) return ret; @@ -1763,10 +1788,8 @@ static int vp9_decode_frame(AVCodecContext *avctx, void *frame, finish: // ref frame setup for (i = 0; i < 8; i++) { - if (s->s.refs[i].f->buf[0]) - ff_thread_release_buffer(avctx, &s->s.refs[i]); - if (s->next_refs[i].f->buf[0] && - (ret = ff_thread_ref_frame(&s->s.refs[i], &s->next_refs[i])) < 0) + ret = ff_thread_replace_frame(avctx, &s->s.refs[i], &s->next_refs[i]); + if (ret < 0) return ret; } @@ -1818,20 +1841,14 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo VP9Context *s = dst->priv_data, *ssrc = src->priv_data; for (i = 0; i < 3; i++) { - if (s->s.frames[i].tf.f->buf[0]) - vp9_frame_unref(dst, &s->s.frames[i]); - if (ssrc->s.frames[i].tf.f->buf[0]) { - if ((ret = vp9_frame_ref(dst, &s->s.frames[i], &ssrc->s.frames[i])) < 0) - return ret; - } + ret = vp9_frame_replace(dst, &s->s.frames[i], &ssrc->s.frames[i]); + if (ret < 0) + return ret; } for (i = 0; i < 8; i++) { - if (s->s.refs[i].f->buf[0]) - ff_thread_release_buffer(dst, &s->s.refs[i]); - if (ssrc->next_refs[i].f->buf[0]) { - if ((ret = ff_thread_ref_frame(&s->s.refs[i], &ssrc->next_refs[i])) < 0) - return ret; - } + ret = ff_thread_replace_frame(dst, &s->s.refs[i], &ssrc->next_refs[i]); + if (ret < 0) + return ret; } s->s.h.invisible = ssrc->s.h.invisible;