From patchwork Tue Nov 8 00:00:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2477669pzb; Mon, 7 Nov 2022 16:00:57 -0800 (PST) X-Google-Smtp-Source: AMsMyM4pg35dwcSVXJbd1NIvY3D2KTcvvz/a3lt3cRUmDT8iYmmrRaBBOQe57F3Q9zgUoxfsRiET X-Received: by 2002:a17:907:2c63:b0:7ad:e1d6:280b with SMTP id ib3-20020a1709072c6300b007ade1d6280bmr844173ejc.512.1667865656834; Mon, 07 Nov 2022 16:00:56 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h14-20020a05640250ce00b0046109fd5943si12307606edb.544.2022.11.07.16.00.56; Mon, 07 Nov 2022 16:00:56 -0800 (PST) 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=nEoVOZIa; 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 4C80968BA43; Tue, 8 Nov 2022 02:00:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2036.outbound.protection.outlook.com [40.92.91.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EC9D68ADCE for ; Tue, 8 Nov 2022 02:00:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XotHp6fomQyFBvhmUdE2ppQL/4EQ+oWpO5SXBzf+0LEFLVoh3VPTNwvrl7Y9qHcJ4bwAEMPaAWvOMI6OXbVZF1d2bQbGD6gPt1JaFD2De2E1sLeqR+NRdHIUSC+0MSgQB10/yZrj4aeJ3169M8Cmt0YtYYnRzI9cTQ1VH1wCbnV556XdeJne5kl3BR/hFV30ZD3sxPkakArcD7hcOs4mXkx8Syl3nkLuXbqBxbsmvlktXw8qw1j0RTNVA0z0E9DPJ0tYfm+nNQlbjfT8ysqx7iPitQq215fclvio1u2/YvsvZTLrmWiilrVkZIBJNc6oIqholWdQ4qr5czxbbKDImA== 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=OSZB53Sr9YIScBL0mOHsFvRNIK0BeC6G966M/DiWgts=; b=N/zq+156czMWNQRcrj+8+tAxFh5FozYxyJkzd1U2enutg9jMFMO9hl6Og90knVPuddpd2xceryWtygnTlG1BC+7sUANWvVdSQiI0/7UUjiTMDnbkspFH4zC76FfAAR3MBPFOUOJmEJErjLmrfXRGG5MFak3OMzrLhWKGyzrSOFnkYvWizA2VLR121TdQMOKUZ/SJxC3UTbRHI8UvAG22bZiu/7htoJAejlbVd17KXcjD0KWhGG0mH6shVFi9YYXK771l93zmJ0eaJHvfjXRSaWibzwE0HtyvGPY9D8dduxQgTHqzb+wzFeiTvnbLZkK6ClOH7iuYJr44aW1RJ+qxsw== 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=OSZB53Sr9YIScBL0mOHsFvRNIK0BeC6G966M/DiWgts=; b=nEoVOZIahlbvLF3LzHQlchVSqQcuXQS5tgh+3+N6yJHhKqnKcnilfS0LtXngUL4AZv8Y+e+W534oWUoL6pSU6UqBzN0bdtA8BYe5XQQrYDO/Jk7sPfF9h/gxLDi7x+0sRZXPe19Z1b6Q4aBQsdyEOzR2hNTJa0byedgIYwJD/N8AWWJxIn0WOyKLAkWzbbJwQTV8MbadOL2QrG7B1V5UElknYrVE7z5xLJV6cTsSUuEELXAQpJc3suDhYkCYkzcgWkB2LE8UspcP5PQ3q9LW+gSSn3f1d1X3+V8RSC7XH0Z1iFYrAPFrVjwFmIsFTcA3SoqD3G9rTA5JnG1tnxf3Lw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0999.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:e1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.24; Tue, 8 Nov 2022 00:00:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::9587:72b8:e3ec:c4fe%6]) with mapi id 15.20.5791.026; Tue, 8 Nov 2022 00:00:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2022 01:00:51 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [OPSGsFVBr5QcJH42YckbXTF2yubXaN61fc3tuHN3nCc=] X-ClientProxiedBy: FR3P281CA0116.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221108000051.1835788-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0999:EE_ X-MS-Office365-Filtering-Correlation-Id: e368e861-5ab8-4f76-d5e3-08dac11c493b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmr3pIADgTFgvIEkJ9VKhj+RxbyhBAFfqnEQlxL/62kOYUWvjMGUzX1i2SK8vNM9LKQVvfh+jZCjjGBzgF0DWJ+lKQD3lHnmnGGm2qxQV4xOtd/rZFAvrkvwDKmcaY/uqo/7g747mTOnTdQnwcROd3KU2PDsdo/jCs/u0T073KEOMi8Q4dyMmbD+SSecg8RQCld5/+yhgebWMksPPccQU66oExv+Lor0+6GxkKLA/KcuXhzzmr8Na3EkK5TU3AnfrASF6Mw8C4d6KHv44AQZ+jrEteGdDfRy285kofPDEw1aWrqQieFliJfVN4CsrvOD+DrUS0ajVo3AujMS91RimhjYWexycjFOWn9uyup/5pdISKfEbtD+23PiKOk5+5d3QvoeA0Y5t9HOsvf40KdRyQB60rE3nLvQ85U0Smtoa6/2iGh1WSVE6EaTeL6yQYWkaKnvdrRqRPbrwtZISpx5dCWERkBNWqVcybFcQblxEHwd/ZVPqaUV7t8CWr+vNa8NaLr5hH4bj4H4GC77iTBxBMed0zRagQE5t4oeF7FUCvcQpSmCCfnJDKWl3waqdob8QNsjS8w+eFLCEa6xMivipK5S8UT5DFJOF7Dsczb7WejCJZANubr5+V3pmLjg4XnGEyZqoZG9KnbMM4g8rneEsRfGy66LvrYM+G5njnb10MHGeOh2DXqZw3jhUQVD3hpH+KrrHAkE2Jb70SoDNp1nZFbFbQPgABuRTcc3koPHwtxa/insz+n5s1MpkPllYTI1icY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6FfdQ1Sv4tw1i4wFx1mc0Kh5h4YlJUyNOYzVkwTTW2w6g7sb8YM4wuafkLCUQyZ/cJrt4UkGbRyzHYQ/HqeV0IQ3kY5xmNA0paLOhISpDOS22ZGHbN6Y0brZ+fKepukI/5yDOAfCNMWTFo9lkbvouLtJ/cb6xx/tS4V1lqVO1Wy17T4I9vRl53kDk8YGfDn+RnyhJN9P4R9uYwRb94oa3dj5cKj8s9hPRrXqx9S2UUfqrkwD8BZ5Doezs8CD4oi//I0laILMASqa6ZLFbreKz7hDXlmb/cGv2A7GfdVO44FBzBQtfg3qJSkt+Sq1A36WzWijc6xf2jAdDqSuWO8/F7QPEB+w+ywR9CE6HjFWZgyum/UReOLHzMwmauLVxuRB3ebVVJNhhR6vVYqh4iO1cnHAiY++w1Mx9DfKAUMXrDNqXq1+BdNaUNOPCl42NzQ3QYCENQ0AZz6TQ7w37hwN7QkOfOV8yOy4LDOrcTzlfwIIH03o2FK9D5xcgr7/CBmHFuZFw7jTGT/o9WxGVWc1GOz327L15y6VzhkXY5OJ3D8pQN3g37EvnR/VSvfraNN3tDoeFmAvQPVWyoepnmKGTivOSQaBAe3fAGP827gkE2o06sw5+HltuGrafEJlFKH25H4JbTiW/hVe/4vt/lga1+YXjb4ByEWR/p6qTYyifkLBqu5OiFl8osBME/BmTcvl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9SY3JrwIFm8nWvjWgwa4kOSxpmBd8kzbNxpqGJqAmQ4QI64fEQflFwvCEfSX8OW6pdnCa/t6zxP3htaCcOozdYKYEeeJmtb1qOdXS8MZlmcagVHRa3Xp7+dJuSO2nQIGct5K+c/SmUKYv6JGI3L1GiZjuPsgP3PCjaryiR6y9VxsusQBzw5Y6rRn1paAd0g4d47Ga32F4I3jrX3MQhfzgce4IiQCxEUBHHRJ/Jgf2DX7JJO2l5KJzrQ6is4PSmd/z3yASN7KEacBgArnMdFKc/oCXJJ0p6ssUVheIgy3zeVNmFiwSPbG+WE2keo1KIIS479xANWLGPdje4Zg9DiqC6wPC/ogYWvpI0SwNBG1zNK55DwsMeCkUIC8niGInuXu1RjlALy7r+NVjrmDMdKcMd5eD/G7G/D/N+bCwkmCKTNiH4k377U9oI9POFBGgnlHCK0pqKz/O5suCG+khiiGYmO3kwcm2z75DRTLSYtyt1hzK+WY3sBNAlvN2EeQd7Z2MTVu142+6/MdkLMgyHuuXNZfKbJoAoLUEUaF6YqLPVCZRlEBdlvYn4vya+HDX24FCcHPkfiuC86JsrNx2jGaOsyUEvUzJrZ/5h40gP6+79VRg7m9rklckONRzgLTn9uU8H2xEhHogSUHV/LhR0xJEw2APO/lJdXHSulrl4gz61Sa+VShmR6jDm09QGTzu3vQIgL2+Iuxzyr/3s1pSmFeBf5z01jyTDzV1DGqJ+bAYj+s5AVO0CO+IW2uWvu1QBYvmR5+sKEmF6Tns4AxSedwob/uAo6sDX1dUBb8YQTMI/AzRoc7yAtbWxVijY5POjXLTrFuBSeSxMigfk9+YpZH0XfkxbjIyGFcTPgyGDgqAfAJFRwIo45kbyyWmSOWnt7RIA6IWm5U2oawgw1yLDpGzIg8+O0L0hjYAleUkw4zx1xCNjwK3jah7rnujoLacVxgSt0IAxltaNq9LOTLl83IsTMX52gxUvmmNfkTCWhAFPC2bGaM+BKqY79lMNLfo8SQVTMBFo+mnzEFf2Dpi9nd2qeklRGz4VsT+Yb/Up7dEGLHtfABi/m5dZTxdgCZqfYjkQPr9EATFKOdrbu5e8UXxm2vSH68jCOXDfn21C9ULJeJYplgQ8SiuaargxFNQb9HMA2bfQyCWriDv4qidOp7yiSreZ9VxQDZaGAFodX492XmJ+O66WtrsEXNSryH0hB2RBk4VlyeD7zYS7TdH1jPP09VsAIDfC+8QM6cOGVGDU+nSAsnoKItZEcGQdKtLU1UoviliKcd473rNm2nFyXastTEqrnPPUBE6ZtSc1nKVZdW/q1XiieLCaRlMWGbQ+ir X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e368e861-5ab8-4f76-d5e3-08dac11c493b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 00:00:46.0593 (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: GV2P250MB0999 Subject: [FFmpeg-devel] [PATCH] avcodec/mpeg4data: Move ff_mpeg4_resync_prefix to its only user 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: X4Z24OmGdUNJ This array is only ever useful to a decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4data.h | 4 ---- libavcodec/mpeg4videodata.h | 1 - libavcodec/mpeg4videodec.c | 6 +++++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index c5a2b14721..d3ba947f43 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -362,10 +362,6 @@ const uint8_t ff_mpeg4_c_dc_scale_table[32]={ 0, 8, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,20,21,22,23,24,25 }; -const uint16_t ff_mpeg4_resync_prefix[8]={ - 0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000 -}; - const uint8_t ff_mpeg4_dc_threshold[8]={ 99, 13, 15, 17, 19, 21, 23, 0 }; diff --git a/libavcodec/mpeg4videodata.h b/libavcodec/mpeg4videodata.h index b20096067a..8aac8a2255 100644 --- a/libavcodec/mpeg4videodata.h +++ b/libavcodec/mpeg4videodata.h @@ -50,7 +50,6 @@ extern const int16_t ff_mpeg4_default_non_intra_matrix[64]; extern const uint8_t ff_mpeg4_y_dc_scale_table[32]; extern const uint8_t ff_mpeg4_c_dc_scale_table[32]; -extern const uint16_t ff_mpeg4_resync_prefix[8]; extern const uint8_t ff_mpeg4_dc_threshold[8]; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index f91d2753f9..0a100d2064 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -391,7 +391,11 @@ static inline int mpeg4_is_resync(Mpeg4DecContext *ctx) if (v == 0x7F) return s->mb_num; } else { - if (v == ff_mpeg4_resync_prefix[bits_count & 7]) { + static const uint16_t mpeg4_resync_prefix[8] = { + 0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000 + }; + + if (v == mpeg4_resync_prefix[bits_count & 7]) { int len, mb_num; int mb_num_bits = av_log2(s->mb_num - 1) + 1; GetBitContext gb = s->gb;