From patchwork Tue Aug 9 18:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp426117pzi; Tue, 9 Aug 2022 11:35:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR75T67F8u7jn8M53qN/juhsCA2L2iABIMg9l0DH7y0UdvsdvWq7mgj0kpkoNKVmF+m8igkm X-Received: by 2002:a17:907:c0d:b0:730:a85d:8300 with SMTP id ga13-20020a1709070c0d00b00730a85d8300mr17715489ejc.558.1660070130988; Tue, 09 Aug 2022 11:35:30 -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 gs32-20020a1709072d2000b0072a89cb4513si2663437ejc.494.2022.08.09.11.35.30; Tue, 09 Aug 2022 11:35:30 -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=DPYZzRDM; 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 A308C68B830; Tue, 9 Aug 2022 21:35:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E602668B815 for ; Tue, 9 Aug 2022 21:35:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hytpmEJdBpcs75Waq4AYuXASJLEp8Pu8LfHOQv686lM5gdD3I+ZM4bHOf2aOQkjET73b6Qnm6+GRQrD+Bb5pVyK+6JrpZck/JMq3kTuG4eymOcBrJhGIrSWcL1IRD12bpvNfgZ6xeRsMrmCT71VO0Do4HkrkqULnNXnkKn2Lmwdhj0tpGBVWNOk9fuP1oAg/07ycld1DSk1q9mVp1hks9spyp6O5OUyao4i43Ih6e/gx23ey1M6HzBM0qjLZWei36+2XW7MFvSltUbGfG683DgJFjYF94Dc/yHe/kDLE3ABFWOSefwufo65vjERkpCVrWuXG56Kbyj7intEeVENOfg== 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=B9pp8kWjMllDWqK6Wrv1AV9L0lkuqwETTHm4uGNO66I=; b=H5q8xNzyVWmCcb8ag61rVgdyXYSlzspqGtOD39t9+KQ8eksMlirUBOBijDa5FwEG8lkXErQcssvOFmUOdg3M+xtv0wSd59tcjA+qeXLp/DSwmzL7NTcTrQc1d9gnwI+xV4aXsJo/XUeZfJaOljSPGGgwRERBIlJYsM33mDD5bIpUDn2DLrUil5lt99yF38C1PelG/P34WuTNS/xNDBrlnj1q6EXxXA20xm7wF45OZSaWAFGmq2SJh9uRMSbHxQSu57q5TLkoaCDDpkp9H6RyDPoKtvd1B4D6vCKJyDKccWD5QMrLSqNRZiPLH4P99GcLWaWVzfSQX9hMa8vSy6rWHw== 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=B9pp8kWjMllDWqK6Wrv1AV9L0lkuqwETTHm4uGNO66I=; b=DPYZzRDME8gvbBe6Q5P4K8Z1xmyvbyO9pKshg2m/LTJM+MNpzHzUkK7Q1xYVzUfsjYVG0RK2GWRb9TejaHNodx5ZngGLzByRB3Bncg4n3r9/Yfb5VRzDvma/d569xQ+pQs4NItpfhFNmOpo5hTtf6kynt0K+UYMQsVHiABsJIkBdRrLmKnpwe+6oRIoLIVqM5++Y6CDLVvvpdQMvgGYbZ4kk9FKCJXDglNrwVpfTlYFa9pwthhfvL34wTBg7MYBbMLvIAD8OOdOcuAAQkA+SSxPkP7mTm7P7sgE4GSjl56A0acRDMBIewTOohKPI0Fqd/dps3pusYtmw5DV+ixBASg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:04 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HIiSXOvyNl7zGMTf95yCC19ufVANqnQY] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b52e75e-bac9-425f-c2f0-08da7a35e06f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIj0MyIIwJOZUmiXbsIG48XeVdzIYw7o4KJYAkQgcbUP8R6LsK6NFKW/bjHEMwWp6wFVCrONFpW3/0Ad2KtJFYmAU7iW83hkBLHcRoAU+W+r4r3noBIduktkLQzFVK5+N30uAR6wr2Rg7kwDKKHCa0jFcW5JCU+o72XhDqSsrHGV4lLC7tJoaUK3MCiUyHrSMvpjG/46MeVGFDgXBPsBHZwlE7Kx34KG1X0mJjIB2qWsT7RbGxl7xOf5PNrhV2OpraDuYvFSzboHiw0TrezukYnJEJidBVnjtBFI/Z8JjiDI1Bj3XtbVCc9DASfGtUo7wanpu0Kede1gxrlwS9D0UgE19m3LXE5ZUK9NhGTJx+Tko+suckbOzwcQYB8GW9wRERzKIke8bZDfxL4SiakApn5bQ0BBw7Z0Gk43itFdMKX490b2Myy0l/07nwkB6uUUph7W5j35uWm35MfKkqpGkwhEEekAuuRPTra3nk4RZmg2chwVwBBvtKl/ZOqwyul6ZMacZ4uFwgbTEGWP3ZWzGVi2y2WeQB4Hwh1Z0krFhQcpAdhJNvx1no1DruQ5U/LQk9QYhREinmK+izj9LeshpszhzDuU9/uqC/+HPaUhWE861hFgWnwxYCBDAJqpfX4Rd5/AHv2bh67XO6EfJYwFdYBJx+RLhHIldaY8REx9DCsHs3xUbv888Z0NucssUfuN3Rx0Uhc2/ov+w== X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZlPBRxes9RYTojr4BuyDHGNJJ9aip2lf+xnRvCFTH7nyOCrqqC02Y15oSH0gv81wvW/cTwG5ObIcybF/XH4ga22m930iCnjNmmxXdHKE30QM27p9aJob5FT5iMpWl4JS3heb2LUwVx1dS1nw4UoKXuj2e/kPKaf9FiLgQ8lrwbD+V2q0gqXSRnECF6VuTBqnsD9a8S2t+ykGbeVZGcqr5qXCL0lPREaQEeEw7Dd3inLpd4aYcC9fXdlIIlIDCvrInsHU+4aFS8eRjb+CImZvE78ICkHXuEhc52x7GqOXIRQHrpIaUORZ+1rwPqqa6AP0TD2/AbU2o0Zww+yLLWN5cLBPooiDl4GtStEQpPpg1tbHtYMupf6/JODf+l2IZapTY4qtDhH96cIX8D5N1GuzuGG2ejQ2IWNVQRgDJBbAhtCQTzKM7iujH4HzaxqcA1JPuOSljUKzbTK6TifRCt7L8D8KkGai9ARI9QUejzBgBRQC+Uhp/nOjjAJ0EaUHZxkXS3uLpG/fEfkDYAFFLvIEcd5NlT7aP1tCmDYCHTTsnTMyUvfTlkq20IcMP9/zF0GFN/mmF5fm6Corr+saTRs3dj8Fk0GGoZjE/Oe5n+VnF8n3ESl7kMm1BEFY9ZTGZ42DhWxQ5J6OhiHl+ABB3K1sw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i6vnYg6Er4jyeEtNZryEjXQY4w4urKdHlSTwOqtYnYroWAdxBkmjxZWzIa0bQnnlF6iwRcxjTcOExccX/rpQGsG5VLYaCQQl1IzYXGJivgHDt6MwLAZXAGqaNrEkJbwN/rXa2PIuQlW0rITHiJUsZUrfOQ6KjKgGhHktriUSUwX7w5cnwhpV+3Szrx7irLOYBdV1wLa2JxYsaaM162oZfVfSYwy9aezDrBVxgSRayRN17+Twjo3LlLH6+2/HfsuhaYClui3eZGEcpjXw7TYkVevhDtK/sx4sxTH9SVGhB4EOycVp39XVDoRNUihwYgy8TO+TPI0fXAzC2db1Jvscq6DsZLcLJu7xw4JnDGnFdTRwh5w84LPfLLmyUc/7jLzjbxLTFrXJ//7vri1HJzkapUh7czvjFDxXGP3M3Lhm9PIUaE6cXwfSqy5wpNkklwpRvNQAlSixS0Cgp4oB4B3W4KRiWE1jOWqyXSkKlvw9waBMl3fE8EOMvv2p0qPA6WwQaiNf/H72CfrE+iXKux+SnAPM7q66brW3S10Ufruyf/2kgS4r0OEfBxx2HP7IXSQpcj9kKL5/ezCqMy3KRawLzIpTsB94NhN/Zo0GpXr5QqUqWtc1s+vvLE4JuPgksHrTV1fYXzhYA8EgRY/9TQonvllxeEWbhKs45fK988JY88hpKkxTWH52pI8oqycmMjb+HmKK6+MnmWDI3ak6McqJr4LDSWg8VMYs2Ir3XJQWIi/SN36G0vwo93vq78HWe6XCmUAKPkzPTong6nMTWHOwHsPEaH0ItPRCSNADdBg7zMjwwdCENfT4HcsTr1xIoPteW/2uO8CwscFlSdxFzkFgS9oklMEAiaI1+e32a2qKYLpKQ6bXCeq09vImYLryMQIb8Scq/hf9kWS55v5P8WtIpLL5woNTrwSyuhafXVsnhXrKvSw0uGmTzodtSBhavGB0PPUYgvxtfPkHkWJdjiET2RhuAIAuU5V0uGIkKhk/j4PaCeUA0dzXJ7ZjkgUZPtoNXLKFvdxEG5DrkZXnHoR9A3MncxL0kkTrd34nmOr3h1MOwi2JPoTTju/o7GmfvuOk0H9norxWD+HfoJXH9MzT/YOBLGAIVGbzFTSLF1uGfx7iZwH0foPKk917MVVcF//0aHkGad2Pl3vKJbNO1B9XBrNJvpk6lAytKhrKsHDcxba8dQFIJ5PvZAz7wvyR29NwN1slm6uhPJTR7Mr9dRUV67m3z/lbnZQjAUwzU9ljiHhK7Ddok+tCoMYzkNQShXy3wYN8ac9Q3o0sU7uttL9XDsD/45RRbhmE6QlpsFHjWh8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b52e75e-bac9-425f-c2f0-08da7a35e06f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:04.6278 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/mpegpicture: Remove always-true checks 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: u22NaPwKzMEw Of all the buffers that are made writable, three are always allocated and the other four are allocated iff any one of them is allocated; so one can replace the seven checks for existence with one. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index f32f8d061b..dc79662143 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -49,21 +49,22 @@ static void av_noinline free_picture_tables(Picture *pic) static int make_tables_writable(Picture *pic) { - int ret, i; #define MAKE_WRITABLE(table) \ do {\ - if (pic->table &&\ - (ret = av_buffer_make_writable(&pic->table)) < 0)\ - return ret;\ + int ret = av_buffer_make_writable(&pic->table); \ + if (ret < 0) \ + return ret; \ } while (0) MAKE_WRITABLE(mbskip_table_buf); MAKE_WRITABLE(qscale_table_buf); MAKE_WRITABLE(mb_type_buf); - for (i = 0; i < 2; i++) { - MAKE_WRITABLE(motion_val_buf[i]); - MAKE_WRITABLE(ref_index_buf[i]); + if (pic->motion_val_buf[0]) { + for (int i = 0; i < 2; i++) { + MAKE_WRITABLE(motion_val_buf[i]); + MAKE_WRITABLE(ref_index_buf[i]); + } } return 0;