From patchwork Tue Feb 8 10:37:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp678604iov; Tue, 8 Feb 2022 02:37:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1C+ICt2Kuj6eE+ytnxNH2uyCuPZcRH2iUdg3XjJ8tD1/8nu47jRVHghFs+QdqTCddRh3u X-Received: by 2002:a05:6402:27d4:: with SMTP id c20mr3762060ede.182.1644316660988; Tue, 08 Feb 2022 02:37:40 -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 g22si9175537ejt.20.2022.02.08.02.37.40; Tue, 08 Feb 2022 02:37:40 -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=DL6R3HtL; 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 608CF68B1BC; Tue, 8 Feb 2022 12:37:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2034.outbound.protection.outlook.com [40.92.90.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68FD468B06C for ; Tue, 8 Feb 2022 12:37:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V668kQleB9M0yJ/0hcfp/zJ6V7Tv/3sZ8qunQ7Gp8R5dWvQUdUI/6n02FBH99G54xDXbS3yjhVMpRMQK/08L6r+3FDV+rkmiB2mVFqxhZSalvwkaasWqB8dSeD0zML6JZWSDIBQcTHUYsw2OCqKqgi8+ij6Tgud2WWd0kMkznO2PFrIvTVgRbguzyU0o8DcXM2qiWlCXkjKxiNMPM9sRkH3I9h/BfG+vTdw/47LPKI0glLcH+XwMuafOYeulQHpIho3fcNap55hF9KLdYNcUtTrgFjOPl6WcC+Fhep5rbAdphN9oP84Z3EpvM+5azHcCKHkux41PrvdjEl24rnjXhA== 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=qI3duXM8MKPy8dnFdACANrN/CGSi+TyCfan7Nzl01lk=; b=lHk/cnlA0UZhJs6jHqfsQz8jDlGZtO0Jk7V0FDL25b6Qd0MFerHePjo3oiecHRYL3r7E+IHHZJluD/YslTpmI50q88Iy4E1P/bbjvpvW1sVHKu7B3yoduXoixhmPzTY7Uz7g1ExlDST+0JjPASRY5G/Zo4wRUMonIiEpmYxGTTKyuFQnZEpKnGZ9AUv69Xtc8YCFpdxPxkFlUPhu11BcqW9eidVwOAfAqMhaTzLLhWIunM2EnsILMmaU90vgRu1ZwC6M+OW8LAi0b0Qb8b47YBcenGkJZ8MrL5vzsXb9rD9uCjy5sgPF/XwNnxa4hIHZNI4yIwZCp8tgjUIHfOyEbg== 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=qI3duXM8MKPy8dnFdACANrN/CGSi+TyCfan7Nzl01lk=; b=DL6R3HtLrELXaX/Ffju+spvA+qv52Kehd9SiUOIBg50fqXjn5JXwSu76ECNQmV+fBb0aYS5ha28Vw839wBahk7BupByFkuqCHvrQGpF1akaJf5E/IPnAg5hCkz0LA5t5hPGO3VMppF729I7wsCTB4Y1+8ZCajOhyG/sULET5sFQ595kLcjoCLNhOdE15LX8VoxtLBzWVLtE9ndkR/iGdtxl47qEi8iiRl7UANOkZ8Ao4xC9zt0xa5/oEoO1kkrpeVHH27n3O46H8TrlIeWH3pPuZqUtvkf/0USPpjqwBf3yCDa3XOq9HylBlqx0+V5Fgh3i+wmtW6LkVLqvmUNdyzA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4842.eurprd03.prod.outlook.com (2603:10a6:10:34::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 10:37:26 +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:37:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:37:14 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [5o1nFaR0H0QFxflhjlosGGT8ZFP9tgBZ] X-ClientProxiedBy: AM6P194CA0054.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208103715.1073699-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44531766-958f-4974-b96b-08d9eaeeffa4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjTdr2yxJdt64bTh75tC0X2twwdk3ReqM4yoRrwixx2n8VFmvH9/TQbpl+sJMdYat6yYT33w2fwOEEJS2WT+QszGwpwTM6mLSojePH6B8P9WocVCTl1vC0tmJ63Tx3jGCmFIsfUwrCpLSobOmJnsr9MNH0VFz2saUpMEyHfsXYeIpBgg63hv0WEWIPh+hSJ/+Rk+6WdjSHnZGylmlFOUryOr4j8YvFjGhw8009hI5hC6yi9fpPVbh3/qgFhP87atMOmhRJKyvwiHRJLpsKUr77LTxHVkgooDKAdLwt7vRWCfSOEzlQ2efRIDgZ+0tMAoc20OuBNu0zj2mGL4LnvA2J+AHCd+YJPFc5ZaaS2U0Mfu4v8QkYsRhB+nD9LoX+8Qt0aExu+CfO3wzHpjM73aD6TzZAm2K01kXkUhGEa/Ovdx5woQDM74BL1zQWYH8Prd1IrVg6TUkR+aA83KQfPAgkwrtXyJXdw660nTNpBVEqJ6PauWfwKB2X+3qqcYM6X5NchcD2v5dEzKxsMWkiEKRpoJfQ+uNnepuPbSQXqN//QtXQvMiGLdOxn8arOaq/1+C3Bv7NmEntdbjxwDk7QTTCNcmOjgtnfTnGYQLWrHHaQUd+NHodfwcHlj3Uz0s3lYu1IPrNnfD1dqe8qSM6IcQjvaTnERj85Ck6SJFg0DXNdUMZb4iCvZHltpbzuWl1uVX+hKIBJd6ySVXcsVAObqYgsbdNXO6Yg+AwGJl44LhaQOk= X-MS-TrafficTypeDiagnostic: DB7PR03MB4842:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KanjJiFCxDsqOGSFh1et5UFLsB1+0b1bqxXzSrPwF+573Hvt3+QrcgMhmoOhJq2YR/+JckEENE31fBeUvGnkBLRbGRWIUp/8e7JKVQNI5QZ9loNyE2UeDZGakEhjO4AOQ8BKgkcttN8jum/3c40xk9+rGNScbv7K10Ge0Jcvsl2bYxTTbEVJRCADUZbVLVzZw4dKTBZW7m9RIcw+/FU4aam3cM6vjtXTnVXnoB6EeF0OG45rOaQ5VUQ2TnsX/olQ3JUyqhTbljG6xKYy1T200lFdAms9W/kx895jifw7z0Bt4rxT2+SyjOugIP7Vi0sYfDh3Zrcvm7Ily8bk22/Cv4E1suBdbsUM+JAlbFwZsSUnMliH0vetufDKyc3dVuoepyJYfuMxcBy0LSb9C6XvP3X9M+scyGeuuREAobyWBpJMY8p88Gqm8HRDao1p86PqTZAJWwN+v/1ff0wwSC+/1WcC9Mtdn0yh+od1UNl5CDdm66Kv+DUHmOkHZIDR6SRzOog5U8h9NhlpT/flCLH7T1yttoO8MRtCF4loCnFdEVWj+kcH2eDwJ7qgb7tVbtcJzUgQEEYvg9zKUFMuHd1frA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z4Tbqa7l7jvR9LhXYCEYCiEVptS0VNBSxwnpqS+P1d1S0QGO3uBimMlkfhobwtNK4a9lAB2q1NKAEAdxRhUESy65Ee9odWnLGJH9QgDcrKx+vCcJeCkGLk5rc5WHZcmbtjg09F8wM081TKeL1F/bPqvNrA13POwKAk7VQy8I+hDOK1TcgAz8FtSkCPpxhDaM0KnHf5JIWAVX3ZQtu1IU3RZqgkPaSlosU1lAvxhX+nQ8RPqaUSc5kpHLVUL2TwUH/f6KOfiaF4Pgoqk7ag2xfiZK32Dt0lcWYdGLRdrTzHq77kcJUsI+WEhkeH05sG+huFzyehzb/gD99QY2MnQ0+S9toDv4uJ4byFuWR/KNLR2taSk7dRhRBbTRbsJUlEAuMrwqYTlOfI/+lbrYSTfLPPMbLI+1vWeqdJYB3aLgWPyLtqNu0mVfmV3GCKwIjqW0n+NgmDhWClPJ/af6tV2VSRlvRUFTL7QZwZ441CFlZ9t2Bp+l1jefolNpXDa8l2gw9jCZuIlEfd9WwIppnleWdqTlGAuDf+WCVKfmw3tXix5cYpJhz7C0oVmLzO/XLg+PjbwwwIlOaZ/f6Nugb8M8yrgHZ0iz8DUKO/4WIRNji0qXmqocCD9AV6G8PAaJwdS1Lu1lGSlGOugrtswDCn5nEVVkGyALsFkjVB86wxOY6MrIkaF6AZQ+OTIIt4z/7FaAbdhAJXbqqM7D/ImrdwNaEJimPT7c98iUyTiV1Y0c4ImMGEgcuxkfaW7fPdCe/dhIldLzdBH8M8QUS+4BJev+oKkA6iBwvL3+OXT+Rg6bNGxFY/tTZ1MEB1Dv4f38fnFX549cKev7QNLTgDxp6J+JGlPSQyvRMlKFqOOaWmYM4gg+66qExY1/JsHd6jX5zYzxdBfKLsQtNs+gWBlmTu1K8CefMlGhFxwVhbzoQ9tJSIWGA+dy4vqYVVgZkwmpYqbhP5uHHu/CgCcDqW9HwbTL7w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44531766-958f-4974-b96b-08d9eaeeffa4 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:37:26.4236 (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: DB7PR03MB4842 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/proresenc_kostya: Cleanup generically after 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: msr0xwrAH15y Signed-off-by: Andreas Rheinhardt --- libavcodec/proresenc_kostya.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 85651fce2a..08a874dd4e 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1274,25 +1274,19 @@ static av_cold int encode_init(AVCodecContext *avctx) } ctx->slice_q = av_malloc(ctx->slices_per_picture * sizeof(*ctx->slice_q)); - if (!ctx->slice_q) { - encode_close(avctx); + if (!ctx->slice_q) return AVERROR(ENOMEM); - } ctx->tdata = av_mallocz(avctx->thread_count * sizeof(*ctx->tdata)); - if (!ctx->tdata) { - encode_close(avctx); + if (!ctx->tdata) return AVERROR(ENOMEM); - } for (j = 0; j < avctx->thread_count; j++) { ctx->tdata[j].nodes = av_malloc((ctx->slices_width + 1) * TRELLIS_WIDTH * sizeof(*ctx->tdata->nodes)); - if (!ctx->tdata[j].nodes) { - encode_close(avctx); + if (!ctx->tdata[j].nodes) return AVERROR(ENOMEM); - } for (i = min_quant; i < max_quant + 2; i++) { ctx->tdata[j].nodes[i].prev_node = -1; ctx->tdata[j].nodes[i].bits = 0; @@ -1415,5 +1409,5 @@ const AVCodec ff_prores_ks_encoder = { }, .priv_class = &proresenc_class, .profiles = NULL_IF_CONFIG_SMALL(ff_prores_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };