From patchwork Thu May 6 05:11:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27600 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp980299iob; Wed, 5 May 2021 22:12:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRuvVXZruQS+876WS1Laix0BSk6K+jWm4YtfJm41Q5RTfZp/ClA6I2FK9q5t4Tfcv8NYO7 X-Received: by 2002:a17:906:b104:: with SMTP id u4mr2385893ejy.211.1620277939685; Wed, 05 May 2021 22:12:19 -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 i5si1284795eje.413.2021.05.05.22.12.19; Wed, 05 May 2021 22:12:19 -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=ffkYXcbT; 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 044376806F4; Thu, 6 May 2021 08:11:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074068.outbound.protection.outlook.com [40.92.74.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2925A6804AE for ; Thu, 6 May 2021 08:11:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DLsCLnA0dUEnNdjWU6f92w12BauZR9Fs3NWGFB6bj6NOSWh3IklHzTC23q/ipjX7j2cLp765wjVcajyiQK0upciQUeDgviJPLVFFnf3XisPEKURVfJTywnlDH/obhcsIGx4+bzI6PNO/+9E6G3VvdbVh8D2N+N+lPQ0y7rdcauieG26G8hPFdo9B9SDkRKpYTqHE9EM+BMXw8boYjzoSYFwIuiCTKlVzaq8SDy54uFIkACbd2h/Rrv1JFbWONS+G4+gD+BuIukyZGHYLCwOxiKLCUR05A2OpWjPFtO7X5i2dA8B5XtoxPqRmISFHILdDhdeJyvfowKnb4d0cAfJT6A== 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-SenderADCheck; bh=Tr4aZpjAP8JMEVyTmrFsGRpxIO6KCisbmZBNoZP9yKo=; b=HHdHFtjVdPExp2t/VhMd5ZwokB5ri1NPfjAjd8RtDLBvD44fOkmdLWuCSeceEKF5UHWJycG2si3CT6iAIP+E3yMY6ra7tWOAE9JN03/Df/LvnDU5p1t33hK4HMCs7FOMOaIrff6KH6DWfTxZiA/EoxaqegsKqaqvnIh3nHB5EQNhq3gQ2t2DNfCLjElVA1e9fNe4ShfSku2BGmv9x5QYvxc3+tQ+RG4LDXxxljvZaUqnWHetOi6SYso7dCh3Ubvfgz/mONFpJv+wJHDmtB7aOtltYhRKbKogNx1KADcrjGrFjMS8Dg9E2yjhFWi8zmWVR6JYBVtPtALLR7NW0cJDYw== 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=Tr4aZpjAP8JMEVyTmrFsGRpxIO6KCisbmZBNoZP9yKo=; b=ffkYXcbTgErHDcQaBHA0z4k+EOOf1nm4DoodnQMefHnqKIkoOTx3AaztSM1Sfcqq+b0e9S/zfmbfm1qXiFOEzUEcTA3ef3H+GvOAfJChnt0BWgQlesXRwlViWhlkINfmv9/Faq3tfHMXdPgiABFId7DAD28yzOXk1gzuwOfFvzqwQ2bER8Ub6fOI8tWg/YXTCSxi0So5Bx4GWeOFBixo51v2R4cA5L5vVj/rhFN1jhOUoa4dGs7M6jdFkltWIYGFLMqX+qR9FSDyU8kSrbSRvp4Mf73Btb46cArKBRBVRp+qGmPl1TEc0Xy/rXvWzEHae0hfk1Y0urj1PDgJ1Tykhg== Received: from DB3EUR04FT056.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::4a) by DB3EUR04HT084.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0c::340) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:11:49 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:7e0c::45) by DB3EUR04FT056.mail.protection.outlook.com (2a01:111:e400:7e0c::69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:11:49 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:31E4B598265B1E5FF5575DBFD3A6A460216D71F7BB3FB4013C00361BC3F26599; UpperCasedChecksum:D7A6BA2536D375B1B2D6A3F77DA66CA8925BD6C5CF5A77D19109FB6CA2F703FB; SizeAsReceived:7611; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:11:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:11:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [q3pCP+gpHzaqmmKZhFRZxfDPxEaYI8/EmSwQ9nGDqig=] X-ClientProxiedBy: ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506051121.832886-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0145.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Thu, 6 May 2021 05:11:49 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f18aaba5-ca5e-4200-2d15-08d9104d73f5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX1vi4Zzd+e+UNdoYIlAK0SMeG40uUNOrRKaJzsIuKhS3q/u2EZjpbxrvu4YCdqVQ1xjCVmxPMDE0DpWjYJbm8Ni9rixGRKH6Uxi/T0ndNYPYoMyHfByX0zXRHwN3mA9yhPQV6+8Y5uT6ppvhqd4koXa9zWYGtZxD0raR/7JuuGRQi8UgMKZ43zNBffdp4uubcvKtKmPzMU6ZdHMABW6NC34R/CT++EZVzQ0DncfE6fXK69pIVpmSXERR5vCClC/vXSzQhIvd5aWIzCiy5Sc/kp3YLp5LGf4pnndid2a4uNKwMCvfdgumqtesMwEv2CxtAN16jGG4Oz497pSdBH359DQEkQ6nzH4geBi9CjvGSo+h66P79ougjXmvwnu59Ne5VV5NsGOXOZagdiyd4sk+NyAxq8CqMWftMHgYkijuKFfc59rovCt6E6lcw+qK5ZgzSt31ZX/Fna6CcZcJNYWCrG2jQVGihSBT1+RVmrg2ZwWAb5BPwUk0+QppXBNCWBOO75AqKGpyraIdonAWXFGSbew4vZDQf6VCVYpkT4sV4uq2hSU7+cfwDZnZhGutc8Sagn5wwdQMjgIAY3fznyZR3khTE4E2TToBBoXLwGqQd3Fjdppu9YiB1SIUzdfoIXbae5D9ZjLdXlrOdnb+dk14aSB8fyoTHOli+RKa1cKGMyqkD26gGKvLBiE0wKgRk4xL0ObxjXs2GD+jeNTnmN95GVjSlFh2flj+g= X-MS-TrafficTypeDiagnostic: DB3EUR04HT084: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KbLgDSr+iPuAdkiO6GoQ17pLU2RwDjgSrffCd2nfLNaBspo/csbT1stwxLRhFYG1elBaAryKF9P6HmbhbrI+vzc8X0KCvhwiaBxM/tvNd8cfREuK1AgTMELsRmEmE10bd308iFQgzYvCpLttbF5HUmcsgtTclIKc3AAF7Gwoj3H6ChhjF0/gqlaTa16foKawrv3dZtMad2yWpVF06dbHCdPIqtd0bNRyL39lcffrDWxg3cYBNaHRS1QDv4V/pE0xcJ4h8YUJIkQgCRUojri905Kwkusbv8hCH5o6rhST/jBv3RVYvifNdKF24X0Z4vTtRz2RaVYdLjOdACe3rhQjkjflnoPtR4N9Y3pDLAqUydUjVguPLXJDBJW3Mg01AanO2dsoE/li+oSO62f7k1zHGg== X-MS-Exchange-AntiSpam-MessageData: NgSr+RwcK8o0tfap8br3KpAmVZtC/cigWA8h7dJMAwFwEb3cfl5HVH9o+TO8G/kOG0kLJ3kSR6dE8+6kXvzfQA/FWlLeuLE6RBOfIO3nTpkagt+eWDIGEArKZ2BjqK4PofB02WtRFNuRpF6CtbJYWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f18aaba5-ca5e-4200-2d15-08d9104d73f5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:11:49.5888 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB3EUR04FT056.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3EUR04HT084 Subject: [FFmpeg-devel] [PATCH 10/23] avcodec/vp9: Inline function with only one caller into it 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: gtmpE/7tO7W1 The split into vp9_decode_init() and init_frames() is a remnant of using init_thread_copy() for frame-threading; the latter has been removed, so there is no reason for init_frames() not be part of vp9_decode_init(). Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index fd0e0dc54f..783f446125 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1790,36 +1790,27 @@ static void vp9_decode_flush(AVCodecContext *avctx) ff_thread_release_buffer(avctx, &s->s.refs[i]); } -static int init_frames(AVCodecContext *avctx) +static av_cold int vp9_decode_init(AVCodecContext *avctx) { VP9Context *s = avctx->priv_data; - int i; - for (i = 0; i < 3; i++) { + s->last_bpp = 0; + s->s.h.filter.sharpness = -1; + + for (int i = 0; i < 3; i++) { s->s.frames[i].tf.f = av_frame_alloc(); if (!s->s.frames[i].tf.f) return AVERROR(ENOMEM); } - for (i = 0; i < 8; i++) { - s->s.refs[i].f = av_frame_alloc(); - s->next_refs[i].f = av_frame_alloc(); + for (int i = 0; i < 8; i++) { + s->s.refs[i].f = av_frame_alloc(); + s->next_refs[i].f = av_frame_alloc(); if (!s->s.refs[i].f || !s->next_refs[i].f) return AVERROR(ENOMEM); } - return 0; } -static av_cold int vp9_decode_init(AVCodecContext *avctx) -{ - VP9Context *s = avctx->priv_data; - - s->last_bpp = 0; - s->s.h.filter.sharpness = -1; - - return init_frames(avctx); -} - #if HAVE_THREADS static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecContext *src) {