From patchwork Thu Apr 8 19:36: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: 26812 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0EDD144ADB5 for ; Thu, 8 Apr 2021 22:36:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB44168A636; Thu, 8 Apr 2021 22:36:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2087.outbound.protection.outlook.com [40.92.16.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC4296806EB for ; Thu, 8 Apr 2021 22:36:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drlGZlo8IdeW3RXq7y6mnK5cXTdzVHkOq+lOhju3tu8o+vqKf3WC8TQJqWddIMttYkQoQ7/aDHYozNxHEgQlV3ROqIlCmgynfaFovTpuBH8SCjTglM0J8svbdXWDThGzyL1xUDGLUXe8uPBCYqLRdR71bVeA+1Ej+Yx2IZF6rLdKuXbNrcF/YEXXDvgyAzk91Iinb6OgZK3C/dCq7pvvRTv9Rag+R9Qx/sKIH9tlDD0fPqjJpy3phpFF3dhhhfUppTZp54GzvgmQwzsAoAQUvk2pdTJaFN5GIOAmH+EnaIN9h1BzjZ4ANSM+P7V8/hneL60UFkhoWyoAQ2KXTsJWSQ== 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=H/AqQZHzgIwWKlqeX+NoLCn4BVEbavkqyBnuSDGpRSU=; b=bl8PK1+Nb74/IaHkRPiTf4J2dXmTJWZdWnLUy6PBpvow2IjxrbfQOHViw7OGMe6c9a6tS4wJeLhojHLYHtmU2AgP8RThXT5u7vxATRtO5qIYYaubgq1PhEEPhdFotd4RH7A65CyMkv7lBlcFEaYs4+M9qziP5auqiO0M00k5nKGsKM14sSMn2x/9sqwg971sfFBsBQgeu7SQbhMPwz37e1BjaoEssLvQTu/kdbF5NrTAn+W4NsPE+RyeHJSwrB2Ptjmqgi4eBO5KY//Yc9O3cmhqP8McsmrD29yr6zzs1LmdzchPPJdgGwCoXt8tIEt98PzRF9eRMPc1ZSI+KChzAA== 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=H/AqQZHzgIwWKlqeX+NoLCn4BVEbavkqyBnuSDGpRSU=; b=lhebfDopgygWS+K4jgkfBJsKDpkurHzxES2eGDdig0KryzYziNVABufqPlmqeE7GWjstOIdUzZo+alKwj7NLjl90rM0OGD83N2p6tAyb5JyEIpQjsFrWAvYggSww2PHyigTJQG2AvRo4aMWESGfmgOe+I2sxvGZvG3LHGzIACCvob28Xn8WkKv7NJsZMQbrj6GXW/M5SoGc3mIoGpEC4ZVH7VCf6eJX8SSLF/1WShkh+QGBMsvE+dFVyY5VnCSupAcp2APxqDwtIjLpHwHrbXelZJbEdfTRBAXSLngCOWwQc/a7JwDrsqCwDRfVm/BWAXXywRJYrcFh2U0MX55+wew== Received: from DB8EUR06FT049.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::41) by DB8EUR06HT090.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::489) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Thu, 8 Apr 2021 19:36:23 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::41) by DB8EUR06FT049.mail.protection.outlook.com (2a01:111:e400:fc35::84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 8 Apr 2021 19:36:23 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:39358FB288FC0BB4B59632976EAE3A7A62DF459B645E2A9676395F874C344057; UpperCasedChecksum:B77066D2B50FC211931424E823F1244C058D11C8CA780D42376EA63DDF1F7BDE; SizeAsReceived:7384; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.4020.018; Thu, 8 Apr 2021 19:36:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Apr 2021 21:36:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [obRnG6PYCvac06eKrk77mbY1cbLRl77Y] X-ClientProxiedBy: FR3P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::13) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210408193614.1239243-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by FR3P281CA0015.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.8 via Frontend Transport; Thu, 8 Apr 2021 19:36:22 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ed49d175-a3c7-416d-7e12-08d8fac5973b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQDZtlYU9il0kuGVxzoXM2vRsFtEO02wE6j65gxk+XtfAlT6/sdtazoBMpQzXh2pxX8dbPxAVHf3Z9xy3hZCaUN2u7sU641Bo2/rAsDm8dTdHR2qLE2rEwp6KiLukghrWre2c7P+mMIbjKSLyGbUmGqfoNDeaXfbiq4QwfuQZQecXktYICqD1cH7d5vRiTTML4VL4bFn2dnoODrpF0jGgCNmH1Pbw2imMB4ZoRoeT4/SpmOQYBf1Y59CeLXR/FVktWdnXozu5drAtH7wBsO/llibZ5nI10eT3BDIT27CgJEyYeE4QCVG1JoUgUr97Lne8kUR5gjSRxbruIvTRTPX9NBXMCrSjIOtTHPNEl/tSqnzodOrBXrtON7Dn6UIlYfHhwlSP3efzvtNWGhdltWQ7JM6frqkOjy/HYlRJOnGrwIt0d0NkZ0rXRfyY9UomQVjgPOJKQc+wM1LcGmFxFURaHzmM2W3Ouj7szlu9TgrIDuymHm0DxN1Du0udLVwAZwo2ghY1wCJP1TGmhgoqLijMWgwm8brUiByo15/cCnBAjftCA7TlsmvP0M08udpluJHuL8QWkn9ecCX4M+LqYnWr8TFivivb+AXGkr8lR9Rg54/cDZg/+S+UzAnnXj8Mb5aFBTAN+hLVGOKcyUtyuJqmM1dNFVXLYe4o5hSfc2p701bD1BnzPz19xKLhSVALa/OUNaMiDyD7syPnEqyGwweBQFpXurFdHuvmyojGbo/txV4z6snlPC324yHmAz3+VfI74= X-MS-TrafficTypeDiagnostic: DB8EUR06HT090: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L8hPPeI5LPvANnN5oyiX9++r9JDZgpt6rV7e5HmujaAIgKqMCLfI0Bivr2P5L3M6iB7BG0ZQcCR+UheL4xK1zo9A3pbGEACvWvxeUrAOaNbrTp9PKYPvbdNNc6Hfr8liVrDDfnFqU8Z3ZG+UUljHNEud0DDIdR8KyS1k1gCug8QY5ogdknLx6MFc2HQS/wL36lFpfBxHyNJ+bfJl8Vug7InsJqxf3nUBhqTtfgtGRQVhDuYVaJWyvaMbE3umyyeWSH+azA/tFDo9FlC/qMBrMzyrkDlTdEbSi/Xlp4BGVh5Z6drFQwBVcXAVUmNRmfOEQVgx1FEir1YecGxUrkmmGJgwbEvZmlvsj3NwIyfyDwMHJiNzNy5jwP+Y2VFIaKz1PV+npgY58VGWtEBJ57xpsA== X-MS-Exchange-AntiSpam-MessageData: e97RqmcudiRBvy7Je6187oS+vcD1e69gUX79EhnJmnkZcoFH7EJ6Qqlsih3zi28Ccv50GdUmAwJqm2JrVDall9f1Wcai5XQ8IYYTDtvgLLrt+8+j2LC2Kkj79NHX7BxcxAszds3cITnEwaFaojK4lA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed49d175-a3c7-416d-7e12-08d8fac5973b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2021 19:36:22.8443 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT049.eop-eur06.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: DB8EUR06HT090 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/rv34: Move dsp init code to rv30/rv40 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" It avoids both runtime and compile-time checks. Signed-off-by: Andreas Rheinhardt --- libavcodec/rv30.c | 1 + libavcodec/rv34.c | 9 --------- libavcodec/rv40.c | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 36cd5345fd..e2b75fbec0 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -285,6 +285,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) r->loop_filter = rv30_loop_filter; r->luma_dc_quant_i = rv30_luma_dc_quant; r->luma_dc_quant_p = rv30_luma_dc_quant; + ff_rv30dsp_init(&r->rdsp); return 0; } diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 99e580a09a..e68072de06 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1503,15 +1503,6 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ff_h264_pred_init(&r->h, AV_CODEC_ID_RV40, 8, 1); -#if CONFIG_RV30_DECODER - if (avctx->codec_id == AV_CODEC_ID_RV30) - ff_rv30dsp_init(&r->rdsp); -#endif -#if CONFIG_RV40_DECODER - if (avctx->codec_id == AV_CODEC_ID_RV40) - ff_rv40dsp_init(&r->rdsp); -#endif - if ((ret = rv34_decoder_alloc(r)) < 0) { ff_mpv_common_end(&r->s); return ret; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index e0903226b9..8532a872d9 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -567,6 +567,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) r->loop_filter = rv40_loop_filter; r->luma_dc_quant_i = rv40_luma_dc_quant[0]; r->luma_dc_quant_p = rv40_luma_dc_quant[1]; + ff_rv40dsp_init(&r->rdsp); return 0; }