From patchwork Sat May 11 20:50:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48732 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp297953pzb; Sat, 11 May 2024 13:52:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUb0bN937truROikR4Dcq7ZzjJNLPoSB05bk05hTebps7dQHaedXbo1vYoaxDVU0ZjpV5Stpp/77D4jsBsF1zq9D+TYhlEzVbM7JQ== X-Google-Smtp-Source: AGHT+IGRyJ3vvifBGKykjgDqqn6pMBrNNS1cKAe82Zg0cJOjdImAT6tKFXb+v6aY6tfLQjMgY3s4 X-Received: by 2002:a50:d718:0:b0:572:9fea:95b6 with SMTP id 4fb4d7f45d1cf-5734d5cecc0mr4399934a12.24.1715460736984; Sat, 11 May 2024 13:52:16 -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 4fb4d7f45d1cf-5733c37463bsi3247388a12.602.2024.05.11.13.52.16; Sat, 11 May 2024 13:52:16 -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=qbRwJmEo; 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 6A52668D4DA; Sat, 11 May 2024 23:52:14 +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-db3eur04olkn2073.outbound.protection.outlook.com [40.92.74.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4301568D2F6 for ; Sat, 11 May 2024 23:52:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ru4ZNJFUIHnerrtYudYkBddqG/nFhYgUJ8ZwsUwhxsj9M631+Kyto5cpbBiXvW8YxeQL+y/MBMZSqVy3clGJrCMPwyLUSQzG35iOxwjYL0VAV4ty/of/GeNTHyr5MGhBhUAfjcHg6Rto8784lLT47dElitUv4K5njQb6NdJLgKlcOvoPmy7XeAal9UkwN2rJAkoUHV6aAz0FiMQMTb61ELBeRK0NIfZpivSuZ/F/D4ZtRTCbBEk9drdqmVyzFxgPI3OlGgKEYSu6sQY6AT7Rx28JK3+9xfVk1Y+zKXo5ivd6BjBGa2lMhLrvlAKASg1N3ZoQw3H5wYASlurg9zHkBQ== 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=OV19Ko0RdD19icqPLGdp10av9v2JX4LjSpzoam5PPes=; b=W4J1/weEVC46bMYcjCzAilOYeVXCbnenHgsQZ8ptevWiqAhyHjqrHGY7nm0zL+vRNZK/fY36ra94N5ZuN/wpdlkquh6ZS7UnO9YmSyQHxIaMHtJmYtARE+TZIbylgrJ2xjvtW4cjARlB9NXWQWberE5t7NQaijXBwIucv30cc/KIDK7WeF4AZB8u1ghcMrt2dOsnJ/W40R3/isMb5rUw7gWO0SLdrv75hP0kYfPuzDyytrpU+U+Wqi0TXD6/x2iA6bUjkxt8SyJ7vC4EHkEWhq3OLmWxJrrd2FJwxa7JDKp4CjjKUDvRtDMskiBnNkgplQhMfs7rbw0g2XnJhNx2QQ== 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=OV19Ko0RdD19icqPLGdp10av9v2JX4LjSpzoam5PPes=; b=qbRwJmEoi9ZZQscOQmnTWuqh0V6q+zrnkoYkTHMN/uhwQUGqsBc/ZKM1/2NL2D4hXp/IsW5cBmtEzs5E0yGF4xNol+vSDJkhbkOubqOM8MHgMSzTE+QTxBvccplQZRxvo3b1x/EOOQCFAKHrR9uanOoMw9jqppQRdME4ikcRWxEu0TTdp5B11PI42IQopNbW6CjXU/rWJiPHIbigRtGHerufXngADCFgnpxrbbsyKdEiuX9zmMKEHc1yEGJ7wdRYKjckvnMvyTSoVHpx+dQE3pTVfNGtFsZvVWv2hZTZmA9jZITid/5Qv3orkKsen8q+fWbFGdKiDBwrOCbINVJZEg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0449.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.51; Sat, 11 May 2024 20:52:05 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:52:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ddohlz8JXXdIR+yEdd8OXjmGKJcyYO/mjYGIYTKYe5s=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0449:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d0884f1-2733-4f27-f515-08dc71fc36fb X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: Q5Wi/ZXdeARPwY9gaMbxwRQXOzOzn2OOfjnZyh9K/zHvxvfR0/qmgTSETV2pqIel6WMDnLfbNjpQvCFd+Mh0ZOCwJ4RtHSuaSMAzkwmlrrkBeTHcMG+ZQEbb3KyQusHfQtUHWBhMuJ6Hm4NTzu+0dGlvjrmN5Gc48wdB2Mpi85uae+Ps/0u5r0iFcZfHCF33483mBIYHpMEM6CY10EBaSMEwIXOSC246XXC0INZ+G6sh/S6rR2h2272VCTjmCgkVT7tCsURLeCPh/34izIgCCpxydRIbcFSoxB7d5GEYbC7qM7TJQnOfVa7EVzVNbjLYCI4erfdmect9cuIE1bWNbC44N7swFgj8RNuG7NVkqftd0TMZfBvjkr284CiQWFXoF+gW7fwqfOoZ4SHMtTw9EWCGjdPUMrUTfUub9Hu5+zUQuAvPpmHPsdm+YgM68F85zGtJqj3GU10LDziRASMi1Bmmc49VLoJMdhuRaIslqNk7Ro+bO+P93jjVSnHbAoKAsgTIA5TopPXH34sM8PA8EBuPOFjAk0FhcyMfE2HNFJGai0N6Eg2M/SxCA4LTAq7Ov1yic1tunxj34jTvsP+rSX7sm03Fao1jWjTDGpkxNGgli4rohq94ng8Wf9ioFhdU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eczmqSevcvrbLCDXOqwnb1SEnP8Rl5D5/SMVmSnpzITY9CQhyekpAJtSl1g6UJYL5dylAtTACyYl3ROeFygcgEX2ECFZ19oQI/i7RKhYKj6OD8pEhX297f3M980BzPMO43t8tRln4ouuT1RfgOqcLZIXYTChkK23ulg3JGdwMzpKs5AFgAuuMVNbzyGgSKa6AyQOHiDR0SJ1OtgIB+RakVFZRv+3xOXTfdtlXpgmFvJBYIjlHts0yV0Q93LsOa/Be5Zw+RZZEds34a7H4JpdLVkTblMi5c1zueLbx1uD4fACREveR+sDEAQH20V0rhigNTCA23GxI1OM3mS/kJNon22FGLAyODDp8D/1FL/0JMakw5+xNTiVD8lLTyXr2KEwZ592ClhvqXdWr0zK2PfKplM9TQV/Se5ntnKreE7zBaEAi9VCqctqWGZT68b9b2G4gtUf1ZnvjiA5JwPhSU0zjNqHXNeyhCqij0wwuLH5JprDzUEJXHdjpXhWR28WwECtoJXDXnnPitJXEaGfr1F7yqJWUGq2jByJidSD/IVEqNd9Am82+2m64K/kQRAYRUG9wnI2FgkhiRSeg20Am3FyoqOwNV8zo49ixj5LSgJ+6uqJJzUKb956vbLMXfCZq5Ir3qdmyPrk9VTyWtcjzOg21kqrSqdysTRkKT/ND04dA9Aj5qwR2gOuQNLmdCU4vV1jit1w3rMBWmigfA8Kd1JvIK5qjonxsoevobQsaFwe8qYd9KFVc7CEXUHuJSkM5l2ORMBjckBHsvFuLBwQqi2s7i0oKXutEiTyuUalRswVYNOjSt+ryk+pVC1fYogof0jbRUNOHob4+7/hUUe0mvmGfNfXJnh1/TkEOJOV0ojbmTtzUvgpNEkXlGEen+4xDOrQ3aURQ2HS4XrDSaj5Hr7aKhrh6AyuwpNLD/y3OfeDej8jsDU0pyvlGfI+X9I28d/11Xwi/ysE9S/lpJotxnsDe9I89MIFKAPscknocTIWFzCSV/jr3M0m+sGI7sarhYy54W/6tCbicYmwfF8s3tbfFaRghwDfS/WJRe9Mq2fBqcgMsYT1+oTYKsjT4wCMdBv6GdVnVNiuBtqsBRSM3V4W7Zvy3KeN4/pKnxNza8Zp01c+iNX7Zx06ooA6y0f8yVB2HMqNNrZU9Mott18rPNQniZrEVUrhCYnWDy44vSEEop0VrmXWErdofiZn1hGP/cZ/f/rPT80t93X3vf4w+SZxm4GOo1EmdbKH63j5SRYZEE96QbifZOnOmyDvmfFsl5TGjhnRvtu56CT/dZArYBZxWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d0884f1-2733-4f27-f515-08dc71fc36fb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:52:05.1206 (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: DB9P250MB0449 Subject: [FFmpeg-devel] [PATCH v2 03/71] avcodec/ratecontrol: Don't call ff_rate_control_uninit() ourselves 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: Ynz7s7FrKuoV It is currently done inconsistently: Only one error path (namely the one from init_pass2()) made ff_rate_control_init() call ff_rate_control_uninit(); in other error paths cleanup was left to the caller. Given that the only caller of this function already performs the necessary cleanup this commit changes this to always rely on the caller to perform cleanup on error. Also return the error code from init_pass2(). Signed-off-by: Andreas Rheinhardt --- libavcodec/ratecontrol.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 78022d80aa..3219e1f60f 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -622,10 +622,9 @@ av_cold int ff_rate_control_init(MpegEncContext *s) p = next; } - if (init_pass2(s) < 0) { - ff_rate_control_uninit(rcc); - return -1; - } + res = init_pass2(s); + if (res < 0) + return res; } if (!(s->avctx->flags & AV_CODEC_FLAG_PASS2)) {