From patchwork Fri Apr 19 16:07:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48172 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp728178pzb; Fri, 19 Apr 2024 09:08:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+FmORV9VpIibuXLGu3rdbidM0814praiv9KL2SOvny+Axv6OKgRYbTOpWLllCHiXBzJKgOe+PXpAWPoiYynfIAadcu1pBH9HJ9g== X-Google-Smtp-Source: AGHT+IEnubDcU2GJTIvAraxRSIpQdmyKG5zCKo9ogeMp9gb0rRNblQL20M8AcGQdnAq8ayfFJ87C X-Received: by 2002:a50:aad4:0:b0:56d:fca8:d209 with SMTP id r20-20020a50aad4000000b0056dfca8d209mr1903993edc.10.1713542905733; Fri, 19 Apr 2024 09:08:25 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z13-20020a509e0d000000b005705bcdca17si2194838ede.444.2024.04.19.09.08.14; Fri, 19 Apr 2024 09:08:25 -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=@outlook.com header.s=selector1 header.b=ibaxc3gA; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FC6868D404; Fri, 19 Apr 2024 19:08:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2075.outbound.protection.outlook.com [40.92.48.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7AA568D3CD for ; Fri, 19 Apr 2024 19:07:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a4x4mIz7kUb7B3F/usVc98Uo3JrVA1UuL2QTNV4MIyt7lRhfj8Sgfc8a9ai+MQvkXrbnSmDVPRjX0rnbRw73JUDpUiz2U1impHeGnlXG2+/vxraQfRYVcfDg3gWoC824vZ7jWl+fw1ZUezOgvOU9DvoRi3hulmDUvzVl+0xaxJNHIXvCA38+Y4JVI5Y71JxjUkJIylYHvbPJKF2LJXXdSalgOvc98/uRJrtwYNJxtSFIlOi/yR3i/OzYRtRzzawvPB6YmiWEkY909B0gkOKtq6HOtUxAcxmvzAh4js/eRMLbj71qNooiSZ9VtGmNZA1F35hNKJCl0HJPdu49Ph8B+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+3AdSTByyAQIE47tacmmsatyDfmeuogLUitLOv9qVSM=; b=aRRzvuR1ujH7GrXV1l+JAaJnaTwhd20gZ2oSsijfv15d1K9dCBBC5Q0g1mUGiZGjof2AdD6m1CEScmEfy8atXEhB23NW6mJMZ3tr0YegV79KovOR7MkghTp57CKDhWwqv2gXKpMOyFfKd7EqdlRICIwUznOvoabavxyKGCN7f5+/5+nL/2m2tvxo0b7RsWIj/kWzmXvfgf4jrjeuijfp6XDQoRe5FxZTEbCr5KzXyPwXGbp4LkSbpURNOudk1ibpjLW2vihEtXX68mL3wayLD1MM6d0d2aWo10jgrI8czn7U5vRr/vkwEfqxUx9aasAYy9rMTY/FGRmiHDH8TROrIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+3AdSTByyAQIE47tacmmsatyDfmeuogLUitLOv9qVSM=; b=ibaxc3gA5P+8SjPiI7fadtofHXn/DSvFNz5CslLO1HBeFhZKqdbHGXR79haDSUrOpBBCZORuGsMoC6PWmLjI26z2OLlg5yWXQ5TS3D+lFc+oOanv1cXYepJSbtgKjWOs7DZQVLh8DXMq/CPO6TdeHOr3ypP7AdIFxukKf7VJ6JpKymVRiOLWznK9Y2Bk72wmy5mlZkQwtd9Tm+gJNFkmhPsIjYWySnC2EILzPTvr74De33UFe+FFy+mH8SiZhyDMjdH6rQ2oPijtzaR6iG6CD36+t9J/0V0oC4DYJQcDDfEzUK6zROlk5RQ9jrpTJehw9FFk8Xhxjp0GNQWyTvz5eg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0138.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:321::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.41; Fri, 19 Apr 2024 16:07:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.042; Fri, 19 Apr 2024 16:07:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 18:07:33 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [lGflkRYoSJjrDyAsK7W7HC1CqJ1IosuIoMJlES2ejO8=] X-ClientProxiedBy: ZR2P278CA0006.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240419160734.1104837-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0138:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f3b4f1f-c7fd-4801-d9d0-08dc608adc02 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2PqPlv0DwKpkkX9Vi6bt2aHIApUZQH4au4O8FXHRIpbfCJVrXQSd1y7bi940WKXivW3PeBI2F1q0JeiPea+i5sWlnQ+SfWgZ+TGDnkL5YFGoLvfw8FhCq2WCiZQMGcXz7eVItuewGe7PZkjlcXmIbdM235xOyZFlVwxTkO49A7gPu7NMO5Kmjvx0Ayp5ctH691wQda6BbMRQqnWQXQIFWbvmjubZdL4h/V7c3DjFY/yy+v6IIhs90Lcb8jxQNh4FE8DZvaZPPNjC74iAv62f3TzNMkqxu8ts6I9Sq1x9QUI+cZRWTmB4rKWjZQuRZK5+qhASomCJFJlHRzg3vj1uc61zGeTqKYSwm/a/NjA/5CmDKyaq/JVDFF9nFkxB41+AH3QHyCnPCj0K229eL8sR7aCtCuc/SWEevgwdcG6DrtplsnCRzIEgh2eFjQkzqOhCqUYtONDULVHle8EwlZ8nYzMKewYlARAjDgwl4f5jEoEPM3SmbZ6WTr4W5dWlWrGg094UjDT+JOYv+6A4dpVEM6dlX/vGuRtfvNk39d+PkWvqVpBsyB/dQkdi+ACautkAxzvszOLEQ7cqZ5zChpSHeZbUuUxkVdSoi/7TJOzljI/4HnUlbiWZEF3JtJjsCyJx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qitusycQg7uQE94bkvbIVkUVkk0Q4bJoejNc40iiwH7Ge7V/4TB6PMZ+hmNkFxxiGA6JFCUkHg4rfqXQQigFJQq9i61i0o16Rk8y6NRaj3nE5LqKyCyCkRkKYqrfMQIfvV+bGLr5CjIRRz/Ag20O211W7jE0jqdfvZJB3y7TJCuO335q5lR4WkIftO6zIRgVRFE/yROsdPDHhuJNXUO9fq2Qg8o4iQmIUYKjvbgyofg0p5yL9GHMjouETfNd7HdvC2dJNKmYXY+J+WS5bYwAsbw7j9owWwQZ57U04256iglkCEBab0rl3YtShNXtkXGq8l1o/WuGCaqovl3hXMDR6zX2KLv4hqRIqPXZRYlYrwIBOvA7wXiwX459HwFuJG7YRWsaGLJyRKmWskmqS/y8pcSgqqxPl4Z9q5Xe6kDD3pxTi4QfXuQo/t3SJys+cpGXJCXUH6jB04fzpqbpkeXaQU6gMSfl0LqUHTbBWBoQlJmLidpbmMPZmhkmbZjB6cQ6t7wVt57l0o00y4pELnya3/+VOmvka/3kMyTzcuLvSbTDy/kxmPFNMSdn0VJlpkwCbWnPIJahCWgE/t5vHaegf0cLac6FiQsR0J3MniYcJhWSYWub/Yvt2aZ44jYoeNTgVMyV5+AIteBVwGyCpRKc9mOjZ9hMTz2HVWPySag96stSTmRD7wrCshk0ZiT82T9hJ/3fYh34FZgktmnwyNvNk+prRnM3akRPYh/gExPrwsByhLahutD7Bpv//YYJLAQ5NjtmTS7HuZVH5PiNqICFMMtbHsgV+Ha+BLEn0/2JCTrHJgrahmvdqHtfh6HorU5Arx/doCbHdb1iNNB/43tSUHrzYgiMepdROM4s75090fn1ymHuJRTD7jZIv3eeRNbnhFCXdtNY1Uvpf0WihKjZwCJB0kdW/xqi0pH525QXUV/2Z6UUPniSTATJcEMh/gf/x4KW2hIlNDal8nwztCjwjd1uiL6XbBkV0DxVjwX/WeBhHPmg3z1cyTMS60v1tOXKG3BR9TzZX0aYLaXw7EDP9HxYp60tLMOu3kCEemKXflIzWKO105zKFtG5qs+/7h3IbkKaEujgAztgnFHLVNrlnqwjGKDTJv9kJMqRetjmgcM+1Fs1BU6O36wyt3zQUBdDDOs+q57k4+zAceWNR1x7E5rwoZ8wwDBPtmbwrbzgQNhMxQt1NN4pNjMBDZlf2wE/N3HkytqW1OIQjeSFtgK5XtV0spLcZHlRpAvU1bdL4i+n3cNACT2vzcb6IDsfSNrko7Slql0FF5G2oaGsTzp0UQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f3b4f1f-c7fd-4801-d9d0-08dc608adc02 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 16:07:49.4377 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0138 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/av1dec: Make av1_frame_replace() out of av1_frame_ref() 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tBRxw8f/GvQ6 Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 2a1a249bc4..21ba9d475d 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -683,16 +683,15 @@ static void av1_frame_unref(AV1Frame *f) f->coded_lossless = 0; } -static void av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src) +static void av1_frame_replace(AV1Frame *dst, const AV1Frame *src) { + av_assert1(dst != src); + ff_refstruct_replace(&dst->header_ref, src->header_ref); dst->raw_frame_header = src->raw_frame_header; - if (!src->f) - return; - - ff_progress_frame_ref(&dst->pf, &src->pf); + ff_progress_frame_replace(&dst->pf, &src->pf); ff_refstruct_replace(&dst->hwaccel_picture_private, src->hwaccel_picture_private); @@ -1191,10 +1190,8 @@ static void update_reference_list(AVCodecContext *avctx) const AV1RawFrameHeader *header = s->raw_frame_header; for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) { - if (header->refresh_frame_flags & (1 << i)) { - av1_frame_unref(&s->ref[i]); - av1_frame_ref(avctx, &s->ref[i], &s->cur_frame); - } + if (header->refresh_frame_flags & (1 << i)) + av1_frame_replace(&s->ref[i], &s->cur_frame); } } @@ -1324,10 +1321,8 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) s->raw_frame_header = &obu->obu.frame_header; if (s->raw_frame_header->show_existing_frame) { - av1_frame_unref(&s->cur_frame); - - av1_frame_ref(avctx, &s->cur_frame, - &s->ref[s->raw_frame_header->frame_to_show_map_idx]); + av1_frame_replace(&s->cur_frame, + &s->ref[s->raw_frame_header->frame_to_show_map_idx]); update_reference_list(avctx);