From patchwork Thu May 18 14:10:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp532077pzb; Thu, 18 May 2023 07:11:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5m7xwL/EB3HYCYHyfkN3KXqHpGrNJTI1TSfljePulJ+q9p8Vo7UVq28oofyqIWV9CEQ7d0 X-Received: by 2002:aa7:df8b:0:b0:50a:276f:a3ba with SMTP id b11-20020aa7df8b000000b0050a276fa3bamr2738412edy.34.1684419064483; Thu, 18 May 2023 07:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684419064; cv=none; d=google.com; s=arc-20160816; b=rbNxMn3TnHDLgGMjKlt4jMGDx6lK3o2dXitncCDKK6SPcwWbyCtDYj9iLuG9T2VuDD 7phMsQRkjyk/97eGNQuWW8zFZFgA9wI+t3qFs5i4iz9Efi8aE4MxMZelI8uDKzCoJNGK 9UEj3NSZ+A5Ql4Bt0svhOCqxkwnXamgv0afqgUTLSnPtMwVVhPYqNZKSHlHB/ssFSFaF SLwhYhkQDFFl61nweG/fva99HbjIYGrzx+GIA/yhAgV7nhK4OdHgAKfdHeHWYtCsZKNu MOnmFMuY27QFh+4xTuzscMAcRBtp2oKWZJVeeMrU3pxCQVpWDeME47Vn3r5G4efEHMq5 KT0g== 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 :dkim-signature:delivered-to; bh=4iuQfaDhvTys9KmrsUTyTdEznKV5qnFegYHnppCsnSM=; b=FMkLkdIC01uNY92jihk+jkVy1fgiW8qvRdJ3TZ45NIEpKiarY6kSEVLMXjfAqKenPN 6vbMLf+dOx1dZ4/wWrvehFFfLO0AM4fnL0oZzqQyy8q7o2wg2R5qNmvU3nx4lAlc0PS4 Be/NisiE2kiOvTAe8gLnbsbMdeR51aMVGTVGaR5JvN62IEwSsk97poT6jKbOHkIIHelk oqUpCJcF44VfVtW5fjmvQE6tR/osmlUQOxPfxnZAKMJD6eIlwu3Svp4jDpiRVPLM9tgG X9q6VDdRqDy3OZOE5Ark8hHQZ5yHfWsc0Dloi4fvE/PozklUzYCyCvjJ0dPIbzLOdBla ipNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=XP2HogQJ; 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 p25-20020a056402075900b0050bc951060fsi1060890edy.597.2023.05.18.07.11.03; Thu, 18 May 2023 07:11:04 -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=20221208 header.b=XP2HogQJ; 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 EA7FA68BA65; Thu, 18 May 2023 17:10:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCF7668BA65 for ; Thu, 18 May 2023 17:10:52 +0300 (EEST) Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-6aaf52ff35bso2103942a34.2 for ; Thu, 18 May 2023 07:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684419051; x=1687011051; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=kzVYnMkFFWlrJpwxLVAHBYfK+R7G0R601JSWwy1u0HY=; b=XP2HogQJRSa8uK1MekAO0lbg+9ARmm99EBasMr5W0BCjJV26BK/mIHk3nz026FHciX q77tyUK6u5xgTUiqyMT2PV4XRzCtwr0T/e+E4YyKSJr2roAqf8Z/RXmKp5oxW20yOtr+ Mjc6dJD7aLN2D6Gc75KDrrSP4S5VV6ONvR7yfcYraNEFHkXqyu3GM7FrQdc71GqHC13Z pQsG91iZ+/j7tmcUZgmhzB9rhosfeT4bG2wUy+WkyqvhdXIuzlIYhHr+mscRk4aqZaPP eR3YVSBVyO4CCHfpLV4ft4QL2N5Xv10OW6UZ2blpMR0Q41DLVZGDTz3jtv6sfZCVHg1a LIUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684419051; x=1687011051; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kzVYnMkFFWlrJpwxLVAHBYfK+R7G0R601JSWwy1u0HY=; b=GNx99jdZlmzjujghrnUGH4+QteK+5Xu2onBuusBfjX93QgOYIjLmk8+HKDrz+x8FHC MzxBLgARbsIhZWJey6V6FdCtFe9CckhFI4a3HkrgC468/1RR731e8wqDsSAWzTbVXQ2W Fl/axEwW9irM51KjfzuxeUzOt+bEZooQU8N+woCBBryx5cEBWyCdwjJ8FdrF60sDcUq3 4p9zr9HcfLn98LfCWaY1h4g7K+f3CyMfc7rRB6ZhOcB6Z//p6izO3j3SQksYAbZUnl6U naysYr6ZGyicawo7nfgu8WjldCJdl/oDPJI01CBrWkN2H68Yu3PfhkXoKCKhPf3rtHTo R7oA== X-Gm-Message-State: AC+VfDylQgBHNjSVaIU7KEaC7c3lkJ1KU0Ba7iqZZZYGxR6pyJ+O/Euy Y4MZKJq6ktWW7pkGPZPYSgpZkfF9m+o= X-Received: by 2002:a05:6830:11c2:b0:6a6:4220:70b4 with SMTP id v2-20020a05683011c200b006a6422070b4mr1268995otq.21.1684419050660; Thu, 18 May 2023 07:10:50 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h12-20020a9d61cc000000b006addf2a4110sm679450otk.55.2023.05.18.07.10.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 07:10:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 May 2023 11:10:50 -0300 Message-Id: <20230518141051.59761-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/av1dec: use av_frame_replace() 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: 98AWZ9HiBZks Signed-off-by: James Almer --- libavcodec/av1dec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index d46ee48335..f900a6d0ed 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -596,10 +596,13 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) f->coded_lossless = 0; } -static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src) +static int av1_frame_replace(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src) { int ret; + if (!src->f->buf[0]) + av1_frame_unref(avctx, dst); + ret = av_buffer_replace(&dst->header_ref, src->header_ref); if (ret < 0) return ret; @@ -609,13 +612,13 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s if (!src->f->buf[0]) return 0; - ret = av_frame_ref(dst->f, src->f); + ret = av_frame_replace(dst->f, src->f); if (ret < 0) goto fail; if (src->hwaccel_picture_private) { - dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf); - if (!dst->hwaccel_priv_buf) + ret = av_buffer_replace(&dst->hwaccel_priv_buf, src->hwaccel_priv_buf); + if (ret < 0) goto fail; dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data; } @@ -1092,8 +1095,7 @@ static int update_reference_list(AVCodecContext *avctx) for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) { if (header->refresh_frame_flags & (1 << i)) { - av1_frame_unref(avctx, &s->ref[i]); - if ((ret = av1_frame_ref(avctx, &s->ref[i], &s->cur_frame)) < 0) { + if ((ret = av1_frame_replace(avctx, &s->ref[i], &s->cur_frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to update frame %d in reference list\n", i); return ret; @@ -1236,10 +1238,8 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, s->raw_frame_header = &obu->obu.frame_header; if (s->raw_frame_header->show_existing_frame) { - av1_frame_unref(avctx, &s->cur_frame); - - ret = av1_frame_ref(avctx, &s->cur_frame, - &s->ref[s->raw_frame_header->frame_to_show_map_idx]); + ret = av1_frame_replace(avctx, &s->cur_frame, + &s->ref[s->raw_frame_header->frame_to_show_map_idx]); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to get reference frame.\n"); goto end;