From patchwork Tue Oct 18 23:13:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38809 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp60649pzb; Tue, 18 Oct 2022 16:13:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4dozuHuLaU/qn+ya6VnKO3wiREak4TFH4x+Jr6QNO6v9UiLnxk+N+UIVM7UB7I81KjleHV X-Received: by 2002:a17:907:7e9e:b0:78d:f3b0:fc78 with SMTP id qb30-20020a1709077e9e00b0078df3b0fc78mr4399005ejc.478.1666134801961; Tue, 18 Oct 2022 16:13:21 -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 l24-20020a056402231800b0045909f3bb10si11183368eda.283.2022.10.18.16.13.20; Tue, 18 Oct 2022 16:13:21 -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=CMwrI62G; 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 EFC9068BB2E; Wed, 19 Oct 2022 02:13:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2012.outbound.protection.outlook.com [40.92.89.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F64E68BC38 for ; Wed, 19 Oct 2022 02:13:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NUn2CriKqggSa5bMif8CTUMoj6lo4H5rbnAuvR+D2GjuakuecO/2blC790LjqahvLzIXg4KrzUkfduK4LfF/SZ52cgHZ6hMHZ6bzCgXZAwZGCENZ7xYxCskUI/qZmT0eTxv/RlZpIbBYh0vKQzxnKtVjNctnCtVy14QkmQ1IeGuaPAlE8PUCr+QprC6PsW/ZQb4X2rYJxvV0NfZo3mLQtm55FtuXqx2ab51ie4GQFkZHpPMrj3qLNrdgijXhFmey0jiPIfzHUkzyrTfk6wwJVKPN96WxURYkDyZta7tWvlLb0LW+gJ5/cy2D6Vj1B1lYxsu2HFWUScY1RHFTZtKMnw== 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=AteJ7S6/didzKy2DEhimjZObU3PugnuDXSYWAaFtM0M=; b=Cr07yUfHk3Spxm5MP30LJFwNtk9ZvjlZOd3xF2N9SNEo7NhtDnWwlOl/oFzhXI0fvbp6uGHTAYqKOxaJ/gXkC8Ch9oN/PoI8cEHSH7leuai9a3PFIM1oKBtSkcvlE4WeSrR9Q3TVEiggp2QluP12KxYW17XILrwCLjWmYFUfjhKv4pBGIgd0VJ23MZQjnuTiLidQJhl36SBZ5k0MyJFQqcI08y5NaZkJZ5Rsny5pbdIxTiuWSlCZj0IQQm4T0twQnmjWg6mPvsTQGzfo1AIJcsJGqI8q97MSSD0N7P6S6kshmhLQ0UlQx4jxu15/up18x74eKiJATJd0D9DWLNfBAA== 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=AteJ7S6/didzKy2DEhimjZObU3PugnuDXSYWAaFtM0M=; b=CMwrI62GJC7tWQ+5LjemqKBD9/0wb5Tv2a/9sPMkm6DescASyRqsx6dBJv1vBqOGkQyQwoqCQYK1lMTc83FOvAF5vFz5ConC2KEiiSexmZ0yA6y3S5gUrlY7bDWP+Tz5JiYDH0uZdUldps25rLesYuPTDjxM9x47rEjEw4WLxIJ4JLY8znW4a4zif2AE1T8GYvEcoqvI920/FadE+F96RgwwhN64/J041n56eypbWBBWv39TIKPjrr4HrsrxOLzCRJHEMz0wxCtT9p927LSquEfTxT9Jqsfq2Hiro0l4a0U1ohEWoLEaIXtYQ4DMTzCAFoR+wjk1nFEDut+JcbeSsg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 23:13:08 +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; Tue, 18 Oct 2022 23:13:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Oct 2022 01:13:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221013222205.GC1970738@pb2> References: <20221013222205.GC1970738@pb2> X-TMN: [MRP5LkxnWk1fZ8fTR6ZdIZWabJsOuPp02IUXZQFmPWo=] X-ClientProxiedBy: FR3P281CA0059.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018231312.465060-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: d1b27d6a-0941-4538-2346-08dab15e5178 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWK/3+84QDQCD5eonqTO0Pf8E8JNbOpgLFvdTlMIdD555sE8BGk0lLFlkKK5iKqw7kAwdP8surxAI9Jwvh7sjh4+6xnZY141sZ8J62MiYOD5ADsRIk0jNcyP4UVOKvgyhGYrth2Vl7v4B+8QKPzlzMxjJCPeyDzubcN6urQQXUmCO2SwcINzoT8Uh+uZ1vSKKr9/ZYMy2vuuXIdrIn48Iw3HFrk0HXE/fqRol7SgG5h4di7B5cHOhqEAZxQuDlcBYyOeomqQ9IK8lKoz0s55r5iLpVF+PBEipthBpFgrheVp1Jf1NnIVzmzMpwmFV8VBeenVNb3caH5dpSLoC+krl9GFeIkXuv93wMLz5LlOrlglaE1YlsC53XPJ8WuOw8wvV+XmLgXOaDdx+90ymyifInzGtVpoRalA4hHGsNNliaxyHG7ftLhwg1kN25tH+J18wK0rMrCNU5f6d1+06R45TPsvCqGLb+sPweWFVtRcGZJxytOG7+7HPhJMddsb12dpiMprI1BmiK8GGweIgs8Tvgep28e6hW+jXM2Z5Sum5R9HwhMJ1q8J69+SYpMJfeMzMvbOTrkbZWXs+qE84i+L6HRSGBmKYTGpYysVnTwecrft4qlSeeFedwhc9KOSyJPHy6KXafAuGMoP5OE5A7o+46kGkJvcBEdqa0wtvOgsV2lkMi04iI/KkQ7lwcZIHkTGJG0bTRjm+rZKl5vVKlULOQPwctH08Tllg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MmTbmqX0caZ961ElkAIFF78mg34KeSioZG1ca5DSNgr2WGkCXnJDu5Kx20uuW2yqFcAjNArSSsmt2YGxf/eZL67rwui0LNX4BJCO5RQXPNUbsZzgj/lp+QrqzTESpgxxfnCyLWVsIeccyXn3cEF4ok+riTbNpSUmJeb57Sj6ddiYzMAG67eR5jA1YzjcVHpPiiYWHe/pbv52uEVAWxh8N5gJPDOB3ECC0XrYb2Pavi7Kf27Gejwc01mZ+FSul7mxEadHm3YbpZYGnL9c6q7oQAka3C/z4OtErOWdn3xC+omj/6KdhrDaFI/ysQB7lgJ+at+wTeC8+oW87/bNTUCfaPnYYbRPZb5Nt0sCK9R0Le7IMsGMykXoYwlrcwGxZg1NwyXrRlNYk6/yi8DFMxZXIXqpoPivLUdGJP15huT32xbQLehXpEIjwyI/ccUHH1Q/ZbVe9sD3OU0gxLeR/QADCoadRrP9VIqDqST2VJVeila8eMTTetc52CQS+5zJnpyWWBH5IXSql4Oi176szMjvhzs3qSykzE9GEyE+d0eP4dX9k8LFjrKkVvrFjCd2kj8GkhVDnAy/R1u5ngYR4OYko/r17rzzCEAASyzJDHkCNHZrPVA1kDzwyCDIhyqMhMvtzgrHObId7Zwk2ayPOnbPR6vErQVNsnbTJzugOYDQteDUhjmKipWYxYNHrW49WJsU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YeFoAKOkVD6GobJw8n8fLSuCf1LqHYJV7p1meqCrIGb2Xw0/y/0JHha1GBeB5Us/4BaeujckdmriFwB7auwNK5rFEdAVSyI3xsL2TWdOpswA5AqLin0unifMj1TmsMYlNyTVqr/S4Wb9QmLQx4lUP3oZII3Q+lw1XPAuQSiwIg7D/xdu3rh8fnyFFPFHaIAY+0zQREYxtDbnrpQVqH7LzAS7bCIV/jvZt1KWw7A/TveZEFSiz9gD3M5doBtyjFWX6XX9FhU9jYNYPMINEx9LPX/j8HPAyAb8UjmDF2MfVkYVyiT6iimFsi3aWCeQEIuA5wh+5o94DIz3Hba+lSUrCRJjGffzuGxmouJoTGfNCeUnq+/gJ3OKTrOzyEGC9BBRvivwCIbMJrkUCgM7Cu6s2x7nOqxvqvB8k8filKYVjzcOCQieP1rbcUlaAlzJJmKRJpee7Z6yirtGoDdZrBpcuD9AfQp1/2l6YTkbQZsE+JbDcONoocATpsRMURX0LH6UGUZHkqgELenB97/NhY/sXsh+gGsSu7abblLtk9yUTQAG3PexNbRQxLdV91BcOsCYPP7iRPwMVwYUTS7CNWxJIFAwCavrO5sVrwLEC/aomP3uFgTcrwibPelGc2h8nVrTb9H6fD7zyKxjFhlfeGPE39yoZihtycu4zOMuYJqArgh0tanLPnryR+FKrPoM2Kp8NWAsJSpIfMYBvK/ynu0cAWChDsvGYgLCgctIoFdLh0CMtCJeeAIDwdVbo8c9W8XDt1JSkE4qELsb5tesPp7dIvTCZ4HKQNbbVoz2Wc2msQsDM0I9JG/tBzqZQz7nQNmNde/3kiI75h53XzJi34CRWexOgYiWj3ZO+wKjpMfVuI9vscejaa6HPRHtWZpxRLVQUbgduhuPnKsbm0DTt7NjTq3cIEXk94Cl40w0DfCqACby3coxOgoRVtxVTmCIW/W18zzIfng+tvinJjR4LVO5inleVa3CBQZTn8shw+JAjDqAgGXO/OW3l+fopiKf8uCJRHFKhQwe5g9bKZtgOo1UGvFi9WZLJWSbzVA4z9k+UZylvnMZ3Pp+oyzchq7Vstc0z0oRVUNipNdGlbTFeDUPYOfxHLkCXsm3+ifiakkLCRVs9s3dkjAw2ERkAy6nn/QX3HJbgJFZkIghkT62Ft3zk6LcpLFgPPBuu5wWKr32ErNtM5BEezAqVz17B6WXrj8A6Bgp17lrgpE00XPROEESmAl74MY7ptBy3bAWJEHFzTxOfupvwYtCwm/PCMzJSDalz113hAFaMNyl/KQMxFTkdGwmuvake8/l7FtmRzHoxL9Yp+JWQQnSsDH2iQB2CsDN X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1b27d6a-0941-4538-2346-08dab15e5178 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 23:13:08.0403 (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: PR3P250MB0370 Subject: [FFmpeg-devel] [PATCH v2 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: 843KjqPph6Wy codec_id is always AV_CODEC_ID_MPEG4 for mpeg4_decode_mb(), as the MPEG-4 decoder is the only decoder for which ff_mpeg4_decode_picture_header() as well as decode_init() are ever called and these are the only places where the decode_mb function pointer is ever set to mpeg4_decode_mb(). ff_mpeg4_workaround_bugs() is also only called for the MPEG-4 decoder (the caller checks the codec id). (ff_mpeg4_decode_picture_header() is also called for the MPEG-4 parser, but it never uses the decode_mb function pointer.) Signed-off-by: Andreas Rheinhardt --- I hope this commit message is detailed enough now. 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);