From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 150024AB2D for ; Wed, 12 Jun 2024 13:57:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 124A868DA6F; Wed, 12 Jun 2024 16:56:56 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1A2E68DABE for ; Wed, 12 Jun 2024 16:56:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fvjuycv+J43lnnr+TrA0hhAjTD9/ZdTz0fTo8IpWHW/03opj0WSXjMQUVwNnVwNJN5ffgLSa/fnLrorXIya1Bm68D2FkKAnU0SbCQ3fXvLpbarBq94irgBcy4LtLCL//uWpxeAmNtkrA87T+y2kxLcfo4ttjDai6ND7D6f8F8nWknNXfaJaR04ZGXP2jkorqYkgQv8pVu9KiQhlJwXWTS/bBdXSRao/wVYIUv07CiZZzQrczjM7X040+XhMKGARe9dyQwsQz1sRu7uqYMh7IMC+P3s5Shx9h4tLVwgekZjQ02OY2PmYoKMq5vzhPHtYeWCjamnjhtOUwnrxJs2ltSA== 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=QcKwv4vcrkIaU1QA6BgBehZLKXDvqi8IcQ89n7X4Bs8=; b=cIslfKCApdZeYVXEU+hvZIHZVlyRRYih1Le+gD7W07YWCrA5YNIFqEjhUU4czGXObm+lU8OcSQGlbW+tF0le41QdtWEpXUI0AXmTkVowKJarjycfQDaM0+josTH0QTRgfUIbOrJ5LjvFNdqtVKtdhlVyfPVveABs0+VoQUeRFBTy8HouU8t4rHhjoKfciUHxIYAqCdpH7r6KW/yChyt9Pp/EFk4MRIDavDyUAi/w1HQgo8hgmgRz7WFHCJtVl4PAt+VqOvN7wzdolW88qwecGOIuDZgBeC6OoF//VAfsTnfK6PrLsZxdboEWlP9ziGO8yKM6gGu1RmS+AUcMRdMkPQ== 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=QcKwv4vcrkIaU1QA6BgBehZLKXDvqi8IcQ89n7X4Bs8=; b=hPUZXGzQ+JBOBXnTjZ2Zt0gMPA4EdsvWGfEblyIQoyeIfWSNqWFs27HZYt3L4axuEB/hqH39iovYSN/6Da1u6le+KE+Za24WyTK4gPCponI2BNXxFjXw9ps+RSz8Kf/rLJoWxM0IisANpThlMFF2GwY3kYB5aG+CLBjwOSQRtCNA44UKzEDkvyqC90REULzt3IZqLCP7y2p9oV/0ZA+VlPlCjw6dmlGIXwIT9/Vh5rAMgyZwIZvZqztaqvKD4C2KfC/8foIEP76ErW7uDQnguj1cQJQuaZA7pkX1aupa3SukcMkagxpnlTxZvTdQbjhzCcTGodWbJK90cGMNsFxwWw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0232.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:56:53 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:56:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:48 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [mwtzPiWgXfQ0wY9jsduVVob63tZn0JBJucP+jZBBg94=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-51-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0232:EE_ X-MS-Office365-Filtering-Correlation-Id: 6652ecd3-aeb1-40b8-7316-08dc8ae78394 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: EFsSpy3+E/IwRCItc8hQBsZxTWDxg+X73Y9Bln1YQahihkUBMWQBSABNAO8e9Y3unzK6yP/Xnl5NjTJlJ2ujO61oYfuvNAMekZieN7ZzOWwp4g+N264iBzC95dzF2GAC6vNp8816rzXkzgE1ZYtpAnHWKhr8BrdixFIxRA7o1x2JWGIIZa1GlBfztCNRehl77tZkLQjJrbH+rxqWrtSovth3JoZfEzFD/BmUvnjpWiBLeqD+NSkUKDOjMNE0FBg88JAJlGhAYgZ1iCNyPkv9dP0zW9VZteYyNaPM93Od25m82KiGr2upwZolp3pwxzva9HX8y3/dJV0al5VepkQ2raHfpeGI2Juj1f1xpOiY0SelQ00/TSrudpVaAXVG/EUSwVzILroMJNU7pxLX6b4PMng1FzMD0ONbMav5zfxIjjGLMD+TzTFCp+BrV4Sz4+a1YHNgLkZN0AgCQDYJhPIxQtnLfFG4gtZNfqyxCzVdjrVpve4urUMiS8ZYYeTD75mR9CC3GMwOZ/yREEPN3yJn5QZfxUk5x90VCpZMGG+fWBaXAp48mPrGPvNCVZADMpm1sEWI8OaypEz+PUw7fveifAHT7kS04IyxsgKHbDWKacZVlichHxYZr/pUNobNtlBn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jSFqOD8HRagip8zRoNce2JRhiGvbvHOsWNAPHBiHem0dH11twPHhUWUdEDAz?= =?us-ascii?Q?4jjH/rGiRJWe/mdRBwJMVNl/UzrgThMySlHgtarOPxYcQdiCj+6vIv1fKfwf?= =?us-ascii?Q?bvOqEu5q+1FlAtjta77LWHgzHkDiXGLTJjB1+J5uAI5oaL00OjfQYKI6NyuZ?= =?us-ascii?Q?/RTECZMRGiTmz/nNJiGDgiXhpiV6u9Zz7DDBRVO4a45FwxiGoGROffgHHwrZ?= =?us-ascii?Q?tlq4H9Aocl8M945ugAoNk00Bk/BTv/InOf/Q+dJ8SVlwNwp6ZzsSKWpH30yk?= =?us-ascii?Q?2L3QfEUf773vD6AGnd2lYqIrpohq1TzqPOiswuuigmjVTXoRkayIkVfA8AVm?= =?us-ascii?Q?/LkcLSk9UnKRSfgVKevBuzfLC9XKvTvkl0cLcXYJVqAEHSCZQssEEGJoATnd?= =?us-ascii?Q?ntX3ArIn9JeLZ1mWS2dRez13dK334B88x3Xh/qIE9IqpFEd2+6L65M7Mvwx7?= =?us-ascii?Q?qPz2sB2M4kr8/uoZM+TRNBLxyT2ZXi7EFG1/kuAYQrOVC0/J5I7TpAGEKzbS?= =?us-ascii?Q?PnGvVdPNsNOcdXMXHH4OpYlbfoAveWju47cjo716CpCtJ2m//fnD6aMuMEoG?= =?us-ascii?Q?nbeJnj2v3Ez01nHyU7SyaZKZ1JItL5Fddphz7pFQEurCONE06n8pYBtp8o9r?= =?us-ascii?Q?h6EHv/TtMFYuU2hQLXNk4Hu2cpnkn6QSYo+AcQ23DPdBx4qhlIlf6zUsp3yo?= =?us-ascii?Q?3GlVo4uKV/HltQ3eXydOgpHDRuggCzRUcor/8xb5kG3QtSkTIsSyWKPHvtk7?= =?us-ascii?Q?y8A/GbURm31EPDPM9nWpSvpmD+EWD1kK4/5klXmfb8JM0Pcb1SgeZZju8Jrh?= =?us-ascii?Q?ZC5WdwmDOkgLEeGu0Mfxz9cLHnfK3BCBEfFK5AkmMI3t2f91opA/RY8vBsyj?= =?us-ascii?Q?EC2gScnHSLTefYeGMtqfPY4xupmftJxM7wzKAqeTvubhECnkAEH357QtgrTx?= =?us-ascii?Q?jIcMiSogLPSLYVJfokKw89sZ1eICG34EijtZGgl8HzfaKCbLEiiny3dUWFdh?= =?us-ascii?Q?fIflw5HVgjOCIEyc+DvzpeSw+ba09HOCNWvxV0X/B8FzpVPiTNeYW53YGuY4?= =?us-ascii?Q?vrZK0/NMxD2wUpi5QyT172pfBYMBtv4IYmnkdKh+Tvbjh4nqAjk5RkywU4wN?= =?us-ascii?Q?IqLu5QiOQVIGVRpCZWh4lCma+Eh+qatx2uXLr7eGvqG+kCe1AW/yeM7cXOE/?= =?us-ascii?Q?TkJHbfvh/DbTlk69gdu3RIk+ZWV2hdXOG9epbOsSImVcYek8YJ7TBqCRB6S7?= =?us-ascii?Q?JYAEV1ePCAefo7j43o3/zsgnDzIX7hB+Lhrm8ESW4Q=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6652ecd3-aeb1-40b8-7316-08dc8ae78394 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:56:53.1772 (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: AM8P250MB0232 Subject: [FFmpeg-devel] [PATCH 52/57] avcodec/mpv_reconstruct_mb_template: Optimize always-true branch away 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: There are only two mpegvideo decoders that use another (software) pixel format than YUV420: MPEG-1/2 and the MPEG-4 studio profile. Neither of these use this part of the code, so one can optimize the 422 code away when this code is compiled for the decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpv_reconstruct_mb_template.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpv_reconstruct_mb_template.c b/libavcodec/mpv_reconstruct_mb_template.c index e39b3d0e73..257767e80b 100644 --- a/libavcodec/mpv_reconstruct_mb_template.c +++ b/libavcodec/mpv_reconstruct_mb_template.c @@ -172,7 +172,8 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { - if (s->chroma_y_shift) { + av_assert2(IS_ENCODER || s->chroma_y_shift); + if (!IS_ENCODER || s->chroma_y_shift) { add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); } else { -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".