From patchwork Tue Feb 8 10:49:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp687634iov; Tue, 8 Feb 2022 02:50:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRPmgZgtuPDEXhx1OL36qBlTTCiK3XeZW5BJ0BIh2liXOYHpukWZcWdByEPOB/I6kh0PjN X-Received: by 2002:aa7:dc05:: with SMTP id b5mr3841786edu.197.1644317401682; Tue, 08 Feb 2022 02:50:01 -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 nb31si424900ejc.554.2022.02.08.02.50.01; Tue, 08 Feb 2022 02:50:01 -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="U0UikL4/"; 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 589B968B229; Tue, 8 Feb 2022 12:49:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067088.outbound.protection.outlook.com [40.92.67.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C39568AF81 for ; Tue, 8 Feb 2022 12:49:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4ydrEj/7IlFx7LdEj3kCpmakTE8C2DDDg9idTwk6X0lQgdLp+phzF+J0oARulWCovkKbV0DgxWlmM6xm8L01kJppsSCVXCc9Gd2LC0kCsqTRGDu9x5Zqz7KZfP7ucPzfsEyUOEDKofTUG2OgNqFRxbXYZ/rG8qTcyQJv7MvEvLOc3hODFc0ilQzUW3eFK7A+m1oW7K5NncSvWrMFu1fwg/K1cDevxCo62wa35siGIBLf4Tuk1sLghshnzdv9Kw/rJZRwEtiCONARAymeMVT/cq3/RvN/ihccA7CLrQmpUS1fnzfIgUlbBO5vui/P9kornQJUr+TY1cWLPnT47XDZw== 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=3WWSd+orP3v0qbMJI2+xantw44GEatqUCGXsa8v2LOE=; b=XBTT9MkRpgM9S5as36r0KXs/AwUzJQMv4NP5ekL/OA/auY0jfRWrM5UK1ZcVXUCEZMX2HjAD9iBrL3dhW191IIDF1BE5KFoG/oTgpewae50gqPYs3Z6pTcMmmp3jnQvULFZqlxCVtUBTFT0uBFpdB+BhMIPQBksLamTaIoIuUGbwfiw96hAmGGmaliwT392oVYbWqOedChiUA61sM2Oxop5DaRMHl1eedeVfUADO86QcG/CO9/NGDwGfdn2xxZ37HvyTh3Rp5azkUvFwAnfkG5YP5JuMq30v0eqAJujNKBPve6tZeORDjtLnMlEUWaHea+reK2Ur6Ai+6hGHch8aFA== 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=3WWSd+orP3v0qbMJI2+xantw44GEatqUCGXsa8v2LOE=; b=U0UikL4/+C6sxSsdTUUVsNQoIykNfyRX5JXL18NaeEcP3qCZI/ALMyRyFRiC1po6xvEMgqhjwE9tHc/vjorZMOeGv2HKWDVysd1p0/g3OSSyl4pOOzzoSmRLXscXhZJaYJP0vLhs97tpjgakloEVSUaYoL63tggiyUrVuRTXIgK4lWDRmh94C/fEDJD8LRRiNjSDad22Z4CsgT7q2Cx8dLj+Duxz9rkiZpdN1k7bkiE5lH9QV8x+JB0KD1JJ4w9oOn64HJCkBfW3VkAX/rNG20MuEn4E2WQPIYiCFvWqv5D2x51AnzN488Vx4PDCk7+nd+/qZItkizhsNC8omK/rqA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM4PR0301MB2306.eurprd03.prod.outlook.com (2603:10a6:200:50::23) 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:49:50 +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:49:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:49:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SiIaetNh9LNbnZ06CGF9HJeGA3kaXz8z] X-ClientProxiedBy: AM6PR08CA0037.eurprd08.prod.outlook.com (2603:10a6:20b:c0::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220208104941.1075195-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6363b6ce-87dc-4d74-a518-08d9eaf0baf0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQlB9bKabCTlQohqaUcoxYjQ4+xweUxP6Yo/koE0sPzw6s04onyL6nWFErXANigOg3SP6n7NOp5eX5010/81fLN6frwDcF8B5yfOh4CqsJ+l5snWW+1kmfDRQX6HYpz3nNwYWub+hO13BKqWrGU2uCU1auCdvLXZxcp4b1KUN5xwHxQtr/uyUdFG0HwSdVNgqDLamNpzQqt6zZwNoSlTOsmJEuLsHY15nkJPZp0cujHPeDxSfrIoImrvu9jFnFBmEiIFS0hXaXLt7Hv1QxLHQ/HJ0piwE6H+FOV02zEz+yaPJUBKNRyPvgBaJIm/WH6Cux026c17/SEs3OqFu61XUVtjLPpg1wC0gDJ19ktqFrxEYXNLij9YivhsdGT9f0oQLv5HJWnVF4g3uGYtPgB0zRTFQNLQRj0+roZP43gDoJ3OpgXIp2cH++XeTqbaJ4lyl2+e/B0xojHOstzdrghrBdUYvMy9KtchV7WRKqzkQUYpvAcfknAzkAfD+dOZPDqgDTG1I2wn2CCMhJ3keOFdsO0RlYZ9kDQiIIndh+9/z6cuFTbjMBAEs4IFhXAM0gOvUhkefwcYp19CS2K1CIkawKzhCFRDmVgSEeuHQPrwCEAOwR7K+BZtMwM9AIRC36b18wGuiXg8lglsyRZ+329GtZiIAn4KZYcj4NZKQiUpb9QyAnN0s//fSrMasb1poj/kIK7Ruu4vTs3dT8kVxYP3ijanJt0/W3jXDCvrdGplJUWWJNQDySIZXE8i45u+DGa+7E= X-MS-TrafficTypeDiagnostic: AM4PR0301MB2306:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uZd9M8bRcM0JsztWrh/6OoJMMwUUp/Txlks/Xy/qFFZ1S2Lvyd+Cy2y0J+Nah3qWndZklBt+AxPY7lhd5oqBev/RKCGMQrfQcGl8OMnC5LieN2SYr2NJtZIZ9WhAXJ5JY5Z7gnyB+sMOGX0TEu5zGI7aVQxrhAO02NNcxnNz1A1zpTVtFmZlktWY88WpnJapGA70j2m2fjWft5xKSFeD9xIngzed/BPcqhiuonOzQ0GeJMdaFdju1j9mOQRmEr5+sKJ8hr/dTotnIg++PXsCcDpW26HnlMB9TysnEA5zcrYl4J06QkTJ9ZGl0zMrBZuMcLcl3MWavxEywqXklnRJnEsxkqYNq2ftDMnAwMAjD2af7LgxNVt6pZ2+KVnR6SslnaOAmGE7gvFcvTBEFVt+fOtbnOA438gZdlk43k64IpZytcSRpavWkM/2wxLJwt+RN6vLKitV+IsTyRhknl8LPm7OEyPisk/1Jy0rcxPcPhgKV4vsC6Toh5vvAOkkko403XFxItQUr9LWQQjXf+39ewZ1x15V3tbRVqJfrFvzEdStgeW9jeZM98o48xUZ9czwx7h4ZhSjIHd0MF0QYL6mRQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MPpcnfbyJiVpUlicZYNawVcIo8m+wQli5N8k3j9xLX2zWMMF3H37b5GCCsp7wE1/FNY3pvSUsUqUAkEk9aBzwq+tqKV+JB6zG7kofCc1xIdlsSZKg+Gdx6Uzp0VQa9CW/yyPNtKuWaC6LrZMYNe7Lx2VG6Mc7cxo/pcUO4fyk8WGe2CUxtnuzZIZ23gNGOoldr9r4jQbxc7KD35bMXi3NS8Etf4Qw2/7+AxJRGdaAg8qYqe3cJopbO4S7FGKfx98vPWBTjNz0ELNKVl8T7r3ivC377EmvO5sHRXgEBJeRXWn0sLkeEwZIM1SxQX8PlcVsgYn74VdjsC65se4NIud26+d4UOB3JRDGnxEHdK0Y4HS+UfKhWL89NRDzg3Aca79z1e9WHvKEXZzZzUb/8TJU+RU8dkUEnHbomwajidfvm8qlrMr0td7ydKkIhk2gFToP8Iubn09PezKeab6SzObYgxRIYLx+mU527RhHEk8yjgs/1mS5Arfr5OdwHnHAD81Nwq3NeDg5pcQsrewUN0q6tMizlcGK0Hcb19iGkmgQ+xroT5sjVkO+qSndT26pshXL+Fj19G0FM/q0zxc1IS3eOO/YFxKUX/7ZfXDPiBHfgjpnJCYh0Fwrj13SzCdR15gc2sKP6ytLEEItnSF9b13m8HIDfVedRKitPHTvvW+DN0alBJ6+l9S0NK2whqfCyG1OeXbOs37nywHfA0yutVPXdf6K8Ko00j/Z48FLcI5Sy2ZWoNNK+47INWbydu3utQ+Nz12JjG6x1V3DXbF3GR77wiHQ0VuuMoabjSOaH5Sa3sT1NRmQMc5ZoSIzL19KbwA3Y9rUIVYgNUAjiMH1EW7PEqXm11To+qjTiuKNJqCQU0dBswRA4ezZhsLu+Bu1PFAWcfrZpCQGkabR8/OOYdS05Y38Ygr3jzUeeMHiXm5JmlwL0XgeVGOfHkdiXho2voHnfRQfkyB1B8QwO1NY32yMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6363b6ce-87dc-4d74-a518-08d9eaf0baf0 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:49:50.3393 (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: AM4PR0301MB2306 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vc2enc: Cleanup generically on allocation 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: /jtY0BipiV5y Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index f0d2cdf62d..ccca78d281 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1135,7 +1135,7 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) p->coef_stride = FFALIGN(p->dwt_width, 32); p->coef_buf = av_mallocz(p->coef_stride*p->dwt_height*sizeof(dwtcoef)); if (!p->coef_buf) - goto alloc_fail; + return AVERROR(ENOMEM); for (level = s->wavelet_depth-1; level >= 0; level--) { w = w >> 1; h = h >> 1; @@ -1154,7 +1154,7 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) s->plane[i].coef_stride, s->plane[i].dwt_height, s->slice_width, s->slice_height)) - goto alloc_fail; + return AVERROR(ENOMEM); } /* Slices */ @@ -1163,7 +1163,7 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) s->slice_args = av_calloc(s->num_x*s->num_y, sizeof(SliceArgs)); if (!s->slice_args) - goto alloc_fail; + return AVERROR(ENOMEM); for (i = 0; i < 116; i++) { const uint64_t qf = ff_dirac_qscale_tab[i]; @@ -1183,11 +1183,6 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) } return 0; - -alloc_fail: - vc2_encode_end(avctx); - av_log(avctx, AV_LOG_ERROR, "Unable to allocate memory!\n"); - return AVERROR(ENOMEM); } #define VC2ENC_FLAGS (AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM) @@ -1234,10 +1229,10 @@ const AVCodec ff_vc2_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DIRAC, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .priv_data_size = sizeof(VC2EncContext), .init = vc2_encode_init, .close = vc2_encode_end, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .encode2 = vc2_encode_frame, .priv_class = &vc2enc_class, .defaults = vc2enc_defaults,