From patchwork Wed Oct 12 18:06:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1505532pzb; Wed, 12 Oct 2022 11:07:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7lJaiOkKDgA2e3v9Z+yh+lWSj1prp7XGYS8w/RyNjLcIk3XHQjXBN4s6i9Jhh4bc67U3nW X-Received: by 2002:a17:906:8457:b0:78d:98e9:ad59 with SMTP id e23-20020a170906845700b0078d98e9ad59mr18354780ejy.29.1665598027136; Wed, 12 Oct 2022 11:07:07 -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 gn39-20020a1709070d2700b00782650a2738si15121541ejc.24.2022.10.12.11.07.06; Wed, 12 Oct 2022 11:07:07 -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=eCZ0Nn2n; 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 7287168BD66; Wed, 12 Oct 2022 21:06:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067025.outbound.protection.outlook.com [40.92.67.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E049B68A6B5 for ; Wed, 12 Oct 2022 21:06:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmS7JIWN5ATLgXipbhe6LQ0xfRDYQNZOeUXAIJcLa8J8kIFMVDXJ01IGGyZbXPZdisHqk8w50L3tvEc+29H/J/gGs+Y5UTwIeOiyzjIJWAFJEl1M9EQbCXcm8kZytF+q2mYisEtjvBHFiFCpw8+C31+XaIwNgJDDDR6kfKKpljKr4Om3iwM0mzHxOnP2+xUIdlI2dCubnoX3pd1RLbJpO5KUe1GEzCGeXvZksdIDiidkBDWrAfHt7CFEXz6vi5PFcBRnT2aLHV02EF9mURj2MDwBTms2bz9YqcgKigeAgaFbEbL9TlhyBfCsJepxdZP5SiKBhtzuSg/qvsN+E8RyXA== 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=Lxp0SF0I40W9BuSh8mOA8yQkESg30FIVhBhO1/52HSQ=; b=Zv1h5Hx7IFzeeY86j+zm/OdyZ3VPArYXqabCWFo045d9vI8FlwWNbbAGAGBkbmQUzMD55dNuzEok0DnuMXIjlASinVdM1ORNplR/CCAOcKd9S56YzVuFiVX5X8qKXQhdDsARmqWTVFKF76u33+yQmc9N5QD3xzGCZYPyWTyycNMRlNVJwYO8mvupVX59CBrZ5CdeoNpHLOYBgv/l1w2GXNF9YdwpbjrxP3HLkEFrDJyhhw89ytsgZl5ACBuCAVf1460+h7xVjyBm12dCaLG0eH4jbt6w4p0cLvjJ1rZALyWOG2sD8jy01W1V3hA+t3onqRAmKVeYJDfCEP4AxokGdQ== 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=Lxp0SF0I40W9BuSh8mOA8yQkESg30FIVhBhO1/52HSQ=; b=eCZ0Nn2neBmm4bjGX1ugHGDuFIHOaO8h+DFgxTy2sxISbv1NTaLpAE3f3olEiVZkNSLIUoCxhgwdfaeJB1+q13isNtDfYFNMk6rzTg/NRuxr8SHzP20cn04+qTzZkfyINaBCj84JVpqV/RcxPBzs2QqWn8FMcOCwbGvUWfvIGqztPAmLBlNEsELxjheMewg97J7xW3Bu9JqnDFAlh/2FaZi3yFLEEQyy6S+H8nsTzsuo+Y56TjkZ9l32CQC8Io8CVtKGWcC5SARqEvH1VvlByY5gbVGTPErLoouf7+x3yGeJ394n+XZwM+GVCl+Bf915ABSzCS4scRhPqgBuwJ4WEg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0095.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Wed, 12 Oct 2022 18:06:36 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 12 Oct 2022 18:06:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2022 20:06:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [jRf4Z/pT8K8/lQK/alwhQZAYwty3Xu5TZ0659tZoS4o=] X-ClientProxiedBy: AS9PR06CA0077.eurprd06.prod.outlook.com (2603:10a6:20b:464::24) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221012180623.1834366-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0095:EE_ X-MS-Office365-Filtering-Correlation-Id: a8eb6dd1-69d3-4542-582d-08daac7c80cc X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHWQzKB2Hr/Rk2TmbbY3HYadj/NQCuQPlzL8mxgoiz1mH8Q3F5KAfQ4GQYMWUNOdwhdOPxRmraztGGFCAPiVb5YTwrnF1zLZvkUpyamcqr6X9uv1z7rBcedqNZ5akeS/RgEi4zstEOH02bNoQFU3JcZsyGLk55VdMatwQ3p049TL2jTtc8lXqZoBp+McK8BIYpdFyHVQEBdNe6lWB/sZU6PZFqoJ5hHNLt/4M0ndoDvte2fOP7Y8/iQ9SDBu35uQYseb3kqOKVNVh4RQOvzxGgUBW1cWTMLB7i/+OCxsRZKVqfSnHx6a7DgHpfh8/Whouree3+st3LeVaHjqNbmJT87IcmZp84Q13+KfrTE/cDowA1Snu6ZAA02BodHDU98I680WNcFwjT/69Lag+Js7KEn3zVmpA4B1kKoPXJc+ShS50DTFBBO/SiNleYpN4Ar7bdWlSMNHETAjKORJTvSTmOq7WTO7qj2VndxQvBIkUwjucKm2p0BihbxwxLM+BdXfjdBgRAqiUwhQk58erUfqgg/8XJNxTWdO6CKDcbajHyWfod23bukN23sqZ71bjfGDd4089Eq5NygKAVjdzB967Pn5IbGJ/MNC6bSm8ZL/yq7WeC0ixj44jymoDFtu55a48eV6EWBhYbZZpc+5cmsCjL0YTGB4bDX1ElcvHxHEk2NOLrNjqUqO1pmVNJKPTe4BMXf6o0z7o0bbuw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XCpK9HaErrTnqSZDNytoyIJ23TS62BKmcGQf3AwaEW0rdSgsvYOkL90u1eq5t+48yVxErfALuR6C1pQQYgPSwhpgKk2kMMfzglgKFz2V2yuZwNjJotA8JhKY0L9X2Mlbwu7Ye0pEb3gyGU8L5SJM/ACbC25emsODdC503IjTl/mRaEv9dpc9xQcnK/W2Wlu7vTjVD638XABDJ7TssDWv2alXxgY38Qh1hJyA1dRNkxEKyvSfTO54L0rNW2l2K0qxi0q6P1YWC1jaDEWw+IGPVUTZhuPmD4h9/XxMe3CGyCS0lMYuAg2k3KCNGd1GEJl2PelbZ2i5PNpvwcMKO/xS/ACARCkKPPGj1B5Zkn5GuOTvW/aX7Srt/tButhIQCg05Fi+0JKLvj41ZsdGuVudsQOw4rWtLbWwkygNFEW/Zn3zk3U2esKRTXiTKEzU+tZ9cs5S26Wvyy7FfReqe8bypyDUpMltKv5jBntrUCjEeGtGJz9LQHkNSz3dNS+f6KZD70+Ze7tRRzBGeoG0zzb78uW9sU9ZMhvE8c1nWGO71ksP0SQdCUj/8nOzLm8I5GaQszXUmHEe7Aj1srVODp+fDPukfgsYs1i5mGhlb8FCwtfxTHTQpHP7S4/Z4sOveix5a3lSkRqIqeao6QGK2BSsHs5VbU60+WcCWa7QWecjGYwkxgOPMW70797ETCX67le41 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oiF6Bg56eyyBOh6Btscafmd9y4k/kLliHP2yfP2DhnrLGTKhkqhIHPL+AgBhZB0b8sT6mRxIWydl72/63QQSL5fRyDxPyxY1qqPcul1D1M+AUfNgfPDHYHxjf4nD5k/hCg0VPTO65HsQb+cOpUhsNjDf86okizcDMHqeFjRtRgPz+j6qoCa4xCDXsWhHqGEh67tcdNTVLJDetcJ5zXkHbjSlVMspZazmXzYgSr7uYAyCw2WEuys4uYLN3/wdGQNjBB3B1iUl/s2t/BbZuhrQ+1llLl7j21O4YvLtuXHaR/2p37vMLkmUm7nbnQ9FUOfbQbxw5o79qE9ZNrWTfGbDyyLwF+Y1vk27yrj6Gs8P21yPPiDWqpxUDpUylHCojjLo/AhWsJrBwbDXqpXQsgmlhZn0sCNzuu3Wc47KyU143QCJ1A9k3Np59x7zRPBln+zOWohIZk+2RDpeVN64dWtrc3UXnO49noul+MqdLr4IavhbR3Uvt6LLLL9/c2L2Q0DEtYOd8XHUPyTODXaRq/VwiEX/DaL2taNCjPFgRS9nIBiarUSml3wUtCPyuew0doLnVuynfq2q1ZTJFetF9VWUshvefdgQN8fcb+gDhWOZvlKQPOm6tW+1ikwIFZs8c0mRW6cbYt6wDPJdOJf9GofzWMd+9XbbaTTqTGYkGor71PsX8gDFsoNahQLNBImeF6MT3jtPVNNsSPW7p98nVuINWaE2jP9qHb0hqrjqCSUjaHYS+y9wtbuFOwNpZPYEkaFLLWwlK3Yhv9cZGfr7IqCJRZjyqCPBIGK5RonYhXEg9jJl5N71dLBTF+MPttVnmWsiA2dRWRqVWjxNSZMrQQ0qJsTWG+OZtbzcM8jYKyx8rCo6dcCda5vAU5X84wOGiE45HD/o83k7vA5HE4BDTeW9VQGQM/cgUwo1yBisq4BanHa/LQYpAY/8yBF6MMwpWH/lQXtgGKUzrXyAUAeKdJLBGJrJ/T5mDqibJz0tqvY7RnmOrxvbqLQxskGx7Xcf2kjaoAZ/HdkwW86zGh7XdqP5jq3DGZHFXBwKu4V8/rdmdf7KgmQr8Z9mm+mbNF4axzmZzvwZ2ZMU0TCk1NsWsanY+S3OjHtqGWxDsJ8DaSYl+MvhU/vDj070M10bC7N8G6smtgYffG4DdEFGKzCMjxok+w9J0KNg4jvISl7m8NVGIwLpjgh8gmBxeDCgP3Cc9OY8gIsWFsB+Rpc13z13YlWhtHHgmcP0dfIz9RkCaEZXGTkIGkb3shMOuj5Tg37jZtj3Xpw9qAQd7URzGz1pPwtz4dX4topN/eXkg8WpJvHZb4M= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8eb6dd1-69d3-4542-582d-08daac7c80cc X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2022 18:06:36.4861 (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: DU2P250MB0095 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/mpeg4videodec: 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: ZTDFe+fIHjWt codec_id is always AV_CODEC_ID_MPEG4 in this file. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index aeb0d003ec..b4e2c09706 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1648,6 +1648,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) int16_t *mot_val; static const int8_t quant_tab[4] = { -1, -2, 1, 2 }; const int xy = s->mb_x + s->mb_y * s->mb_stride; + int next; av_assert2(s == (void*)ctx); av_assert2(s->h263_pred); @@ -1999,8 +2000,7 @@ intra: end: /* per-MB end of slice check */ - if (s->codec_id == AV_CODEC_ID_MPEG4) { - int next = mpeg4_is_resync(ctx); + next = mpeg4_is_resync(ctx); if (next) { if (s->mb_x + s->mb_y*s->mb_width + 1 > next && (s->avctx->err_recognition & AV_EF_AGGRESSIVE)) { return AVERROR_INVALIDDATA; @@ -2019,7 +2019,6 @@ end: return SLICE_END; } - } return SLICE_OK; } @@ -3084,7 +3083,6 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) ctx->divx_version, ctx->divx_build, s->divx_packed ? "p" : ""); if (CONFIG_MPEG4_DECODER && ctx->xvid_build >= 0 && - s->codec_id == AV_CODEC_ID_MPEG4 && avctx->idct_algo == FF_IDCT_AUTO) { avctx->idct_algo = FF_IDCT_XVID; ff_mpv_idct_init(s);