From patchwork Tue Feb 8 10:54:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34169 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp690839iov; Tue, 8 Feb 2022 02:55:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJ0fS3DRQvEKoQoAztnpPasyLZ0PJxJBHDRt53ghmrHHbT53gYVwSFkFIMrvoU8/jg+hDB X-Received: by 2002:a17:906:6a0f:: with SMTP id qw15mr3236403ejc.66.1644317711805; Tue, 08 Feb 2022 02:55:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t21si8573434edv.651.2022.02.08.02.55.11; Tue, 08 Feb 2022 02:55:11 -0800 (PST) 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="Zif6/mcg"; 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 B7D4768B22C; Tue, 8 Feb 2022 12:55:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065050.outbound.protection.outlook.com [40.92.65.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DADC68B18F for ; Tue, 8 Feb 2022 12:55:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cO269twYwA8zIuMzQALbCu78KGZL6kRlmqZk5C8NMAVmfDVMK3oaLojOH3qZUHeEutE3bsZ+Ivgnmqvtx9Q2wQ6by6kM27SWZ5duYqV+0fhj0DYQ1cjPsO7YJwFo6sD51aC/8EIKiCyDroplR4yfuAU0QG6alzm1KCbTu5+opSDQh2gcdKo6KmG/B1dF4uC84h4jyLiH4Bp3npvjmnYG+GKT5VY2LAXZZDzBx3K7bRTyB9Ussoarp/prEuiDS6rvDeH5Gw12kas8BBG+2fDGCNzKD1zF72kJbFLlqJ/E/vFuSQZwcTdUpYfjjJpLUGp6tCo7eHGFjbThfwQk2pubOw== 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=zir0p/3Vi+PIzwGriBSbrnA39Y98y1lq69cBFhLyJvg=; b=KqrcBhkB/+1aTOg0Sze4xszik7iiIXunc4O/IkhsnqJnOmgxMX6GDlBu9EUmKqwxUEnCjNzsT0vGpcOLBNQlibMbO1kV48TW8qBs53+UMeGbcVM0UckCN7V12vgE/FxlPVlt5p11zaf9q5L0hAiIoC4arqnPz6k1pBXbZZpYmx9EubMvfowsFDqGHRPz6vxSuC5cTbnU5UIQcPyr99RaE5LahXKTy1x4bbs1SlH2cB6uR5SmbmRZh+RXhmnLmkii04DnEJkSQRhRBdhdLtN9dXMG6iN149flOUCXh18no6ROhFB/3veoHaoamLEAoqjslURig3n7CYPagr0OLQDwuQ== 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=zir0p/3Vi+PIzwGriBSbrnA39Y98y1lq69cBFhLyJvg=; b=Zif6/mcgzMxzBaXDEjll3bOjw5JMT14UwTL2uqFPEmmPAkS2eUWVh2q81OPS6PV29OA9U5Pq8eKrd/HH7vjv617NFZbKW2nNEEzgDmow8xtF12GMu2FWWNyfdXMtEkpi7+kPN0/qLJrSTjwr+IN1SC8a4wOlJoZ9O3NSSN0STPI2/E7G5mVHHuEg0eyVF8aN/GG+iw19r2Dfw6b0d+7bYeRgGlNw1GIbRpkrs9M6VX2hRGqYHGuoW4bPl1hJvBqNR3HnE2NDPy1p1X/mDMtuLpSMhiFLPkkgbE9xE9sdKm0cCLuwa9kitQ2qgrnSfi/vXMXpSfqakiNzHUSqijYZXA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5220.eurprd03.prod.outlook.com (2603:10a6:20b:c9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 10:54:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 10:54:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:54:52 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [4BLHBGGi42R6hrIF29Uc3VnMWyR6JfKn] X-ClientProxiedBy: AS8P250CA0013.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208105452.1075515-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 965fad0f-46d1-40e2-d7bc-08d9eaf1734f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjTJWMzjH6gTpW9C4OAaXRydvcnsVmhH3jHMdz7siDDcRE57gN9ZdIOO7Pa35NCL/rX4lTXzRd4m6IK1d3dnDLjkhYphPZeDDNUywimny5pvWt9HXfagAKmc6df+x6AouYVQArcDzChx0tPyScZFtEsS4irLstL7PHn1DJ1Q9Vowhf/CuPbPSxLDScotas3pSB8yZEZlphKKgrh2DCr+rvxqY0H8XjZmVGxyAI8ZuH0E4Zmngv6MJoZu0y8Tbx1mFX0GXeRgpWPJ+vyhNF27Vt6Ui0ri5egnXnmyL7YuJQvXqdvx1AkPkOa1mitkBOUN4PdeadOmW5tSqmusAqhjDI5aGil4X2yHoIF0mK36T+FUH1Fh8e7DgJYa+IGFfyIFvhzJso957RV8Lx7qFdx4qh+dT7EgBF5sPjo/a4ou0LEdthLKyoSmYufAA5bh4ZqaUYhivkiG0oZ3toKhfEyh32Nl5L+/vdCcoDOT6a5YJCCggOd/KmMOFKyvaD0Nzw0cpjrDjNuQSX8Ib5EpKg6vdy/DGszGVXgDeoa6CXMvPp4QLJ8h0jH9fNWxMzRH1mStmIHEpzM9ZtdZ9cntsAaK7vtWQllsmyEHrfOaqCxjVjxlNqeHpOBBw480j/E+gyHqgFmkvlftWJhad17YM8dZ5At/jhbiKysfRi0sarr7cTJYyVSaGzz+LfLdaMgLg8ZtwF2IVrhGhLd9G9/MndjXnUedwaZTpX4PS2a8LHAxZXN7I= X-MS-TrafficTypeDiagnostic: AM6PR03MB5220:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: scAfVF2zrG26+H1hP/33CmeqXyWGp11OIz7UatSvMVCiETmjPtbSUDidp4UWY3asNf3enNy2YvBDiV5s4bOxQPCDDSCklwuwiPe8P2g9VOYxtMYufS6vbwZcpqPrzuVr9AfA4F/wlr9UMuxkMX2/iTjvb/o/A+pBMJMU04ScQNkOc3MUKiEWbZAYpP6c5pqWP3KO/ha2XeOyeDPYdMFgScfqG6DP8kEHFuUWGGcvN3SvmWAt8WvL5UaryQyZkuADgBwHuWYQKaebNlaYnxb/0T78UGv+yYaWTp4PgW6HZyGe6qdH2QuHrGNgeqRDxumfaDBqkz51wJasq2a5k+1CbbvOaTIW6LnaNgXZh7xvURcaasVjp8V2I274iFsMmY+rH2wC/0Yk4NNmQC+MuFwCIWugs15Gh/cvLx72+LVxeUoA4+kzkDsox5wDu49ftaAxtDIxihYFoomMwooltWo19SKtwH9799e6dM/8c0Z7xt5cd5J97+cYzOynUIqkQJOQVnTSFT/aF7GxlIsZiFlD6DQv9kiTOkXmSMkQbKYLxTNAI6+QGO4Q3dUVSGRfOHFym47hU0V/gA7/iKfEyfAhxw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WrtdTbaO9y682wKTv9UsnOWGZ3ZGOX7vG2hx4lqEE8RuVe1gUG4eCKqYB7bldoiTRzC7onrTyqGd4aK+v9k9QBd/3S4q2cAs0NcSiVzfgDvLdoxJDxbP23WyifAf46aC589vU1pf/X8kfOzqy21s2jFOMk50yUpPvHSRUEYkeGwQ+POcTwzhsT45UL+UY6GpRIeR2q5QMuTdmIuhCO83gejVrGxf9TBH0kHe/Dp858+jkbF0emnufAhp1adEB4Iq0bo5aNRlBpIwz7uYCEX+EmYmfhq4X4gJRaHZ/T5K31Be7DuSKb8Fd9g6Fwd8PSdU94ZCkOc6bq4AvvhQI+0ts0uDamIIWTb0W1Sudx2/G9wrCfWRPfc0a6n4I7F5El4jLGqHBMQv0GPCaq7GMyu8VFDFanGLHOE5MsIO+Jm6Xo5Daao3olBTEdeqcMlG8zWk2YFO6F6W5HeaUAy4Q8BD3MXnHOn1aAVpjBIWgv/R2ULwsA4N6vCpliicCbhKDdYjO3AOTJ5581PXz3wJFhFq0JPcIt+b8xpF9u40CXvYTEw0ERgiY94Ac9QS3qNkebKQykUxZK8A6YX0QzdeKLUdiv3q8TeUPC4WPDNC1oi1pM2MUWq5sAsbAQTbzKrSMMD9JiTNq30RkRKDN6A/0LWBfB0oSuX2W3rN6EhK7jol7KOIokjQsxFFegHNuZtEPG6H4Gm8JMnWRizV9YlNW1+K7cr7lm6aBzES1MSvxj9A8HnIYa+GrGOaxbhCdZk3/WffRQ0hW47S6AqZkFhT9SBMP66DnR8Ame1AH567YNFL+WYsZ5560jRKjVzri2OqZB7Y573ED2Ij+3ZdPBolHK5fG09TX2j/Bt1VP9TH6PrHD28vrCTb+4pdWPYA9H/kGheWY4xaFEcGUlcIx7Lu2Pl85Z8Gkc15C7q81HBL4dEfn51rEoWxom1YcUikgdBBS2wKKPNWECw66uLLVVmFh0a4tA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 965fad0f-46d1-40e2-d7bc-08d9eaf1734f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 10:54:59.4610 (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: AM6PR03MB5220 Subject: [FFmpeg-devel] [PATCH] avcodec/ralf: Cleanup generically on init failure 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: uPEo58L/FFHe Signed-off-by: Andreas Rheinhardt --- libavcodec/ralf.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index bb80119b0c..0c51f49939 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -163,47 +163,35 @@ static av_cold int decode_init(AVCodecContext *avctx) for (i = 0; i < 3; i++) { ret = init_ralf_vlc(&ctx->sets[i].filter_params, filter_param_def[i], FILTERPARAM_ELEMENTS); - if (ret < 0) { - decode_close(avctx); + if (ret < 0) return ret; - } ret = init_ralf_vlc(&ctx->sets[i].bias, bias_def[i], BIAS_ELEMENTS); - if (ret < 0) { - decode_close(avctx); + if (ret < 0) return ret; - } ret = init_ralf_vlc(&ctx->sets[i].coding_mode, coding_mode_def[i], CODING_MODE_ELEMENTS); - if (ret < 0) { - decode_close(avctx); + if (ret < 0) return ret; - } for (j = 0; j < 10; j++) { for (k = 0; k < 11; k++) { ret = init_ralf_vlc(&ctx->sets[i].filter_coeffs[j][k], filter_coeffs_def[i][j][k], FILTER_COEFFS_ELEMENTS); - if (ret < 0) { - decode_close(avctx); + if (ret < 0) return ret; - } } } for (j = 0; j < 15; j++) { ret = init_ralf_vlc(&ctx->sets[i].short_codes[j], short_codes_def[i][j], SHORT_CODES_ELEMENTS); - if (ret < 0) { - decode_close(avctx); + if (ret < 0) return ret; - } } for (j = 0; j < 125; j++) { ret = init_ralf_vlc(&ctx->sets[i].long_codes[j], long_codes_def[i][j], LONG_CODES_ELEMENTS); - if (ret < 0) { - decode_close(avctx); + if (ret < 0) return ret; - } } } @@ -539,5 +527,5 @@ const AVCodec ff_ralf_decoder = { AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };