From patchwork Mon Jan 24 20:09:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp14777iov; Mon, 24 Jan 2022 12:09:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyizETfGDcgpM6s8ElBd2F1/M30VbdFSBX5SDwsD9GdJIpOX8XZTmA+CfaSNp4PVZN5WR9 X-Received: by 2002:a05:6402:168b:: with SMTP id a11mr17078013edv.18.1643054993614; Mon, 24 Jan 2022 12:09:53 -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 eq12si8283605edb.354.2022.01.24.12.09.53; Mon, 24 Jan 2022 12:09:53 -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=HF1ADfnl; 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 66F5A68B133; Mon, 24 Jan 2022 22:09:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065018.outbound.protection.outlook.com [40.92.65.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEF8A68B0E9 for ; Mon, 24 Jan 2022 22:09:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZr1+n/iwooE3HdF/aEPo2oGVJEIo6jVbOCIJGyuw5E83iPqcuaCa/WWBxrq9YWjJFZ+PfBKZaExr3fYGhYayBk2Xz7mtEdzgLs49++2eLBQEpZVRp5RvXL4gUkTw+zMDNCBUO+5KVjIeEX3818fN+snxmYcwJ08G4ozSiouHKxdcCYV4DWWiiqHL2TDcv5h2DJsWEFZTtX+HkenA/6w4Pj7XiyvcArPTksAJJwQYZUlml5/HVhmNSux2NzwcaWOTKAc8KKZbGCPwE1xdK4wAjrV2fiLMFDIBObTy2YlA5U7luK91H79DIAqPmEe4Ojt16FFVXjdhHOZ9heO3+lcCg== 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=yCJMRgNwrKIoiaJs5w8x5GL0PFEo7vUWNOxVOCwXw0k=; b=Fh7y9rheWJ49naTD0t+eRsISxbbYM6nhuHLdMB5X+nGWzqbjdlnmY9ywJ0E5Wo7wZhjAC07SOk5JhW+RRTNimxzIdSDEZtCOgTl/5Disrgx6GJURegcKkpndWHjVPqVNkKY9ElDgURNPsamWqM6r+7SG3Jsl9qd5rbaTQ5pH/hk8INYccSgvJM8/oQfFUnT63FufnED+sxHq3gN37xt8np69AAT/1Iun5HpxmH36uIC4ebCjlBmyssUPowEL6RyjZQrlYPbC90yvVvtqBpWXiryDyS16mzPgihL/ypgds0JNZp6z4cgMd44brAZ1RGMpsd38j9cQTYCF0hdd6KObdQ== 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=yCJMRgNwrKIoiaJs5w8x5GL0PFEo7vUWNOxVOCwXw0k=; b=HF1ADfnlDYZRNKOjDbVTgkBH4qRYP0IorqSSn3ZEOnVxBaW5rBmAS3zvFUwU4/5A35zU3KXzZhWKU/FYn/NO7J3Z7jbej8iyyXRCptHu6tu9D42xqzmorScKYhuzbSwN66IWyuUdv8v2jzvnVVpq1PWhJIS9BPYBL4TL+VEWMSrwuBWmWE7fLj2oIUNUBakqnwybegggOCC7jikYzM1a91Mo7IwmuffqRK4vY96sgRU8UU14Y1VKgzUCg3Eik9KCv4rpgsxTfh5JyU3x+nNUJfWBNyTo3O9vTqQGNhPf0LnLAhnVSU2TA7+5aH1pvh17osM73kQr1bWCVxA7pzKxxg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR0301MB2557.eurprd03.prod.outlook.com (2603:10a6:800:64::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 20:09:41 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 20:09:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:15 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [fDAUe/tTqy1720/na9/A4NNREwnhF7T0] X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f36382d-c03a-47b7-ba29-08d9df7574ea X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXG2AS1I1R/T45K/68k5ZmOnWe65KGeTJiA5iegn5fmiUJdKFU6HGRQ9zEMkVjS2PJv9INDf/O2Ac4Ii1taDJ2gs6XJjG5vn/rO8rCKCjiNZ55hbCEsaB7URlpgYW/ZNW+zeNWrvu35Utegu56NzwQ+0XCHMy3XnXRUSPlQgaY5W4E24+lalgWU6Yak1i6SSvMk571MmQNRk8xnbslkoHj5MjyTMK3VCtvRpWe37sChW6KttGYo0umcN/FD+eysoErwQgFCUGN521o/doP0RiLX2eeRrdCey7nJyXEUObzaccXjeg3N3q6d1vEHQ6NFzoidoUkoGt7bsNyo2qZsOMuAvSsguQzp4C6x4gJoyZp6aSsX0dsYCZqBP9QxG+zeEmcWsZKAq9vNETauHnEP0RNZi45JY1k1dB2RNCN1Zl5xBCQiByaKjrNL9vXKbN2+av5+OJv2CiUXZkdFmi/TFJWZD4IM0EVG3wZ9/HM9oY9X3RZUjqKTsXufTLeJHqvR5AdBLGVu9ucxWmwmwyhednHOHM6KB6ZIHDc3s+iAJGlM9egCa5EHtRA6mFGCQkXpDu/jUq/vk9Nz38qKOMfWA2GeBckcvsma5y1D8iHB+zC/tq9PbfSD0cTgoNJuBlFb1AJ0Et3BqJTUxePLgfLC81HGyxxrMgPFglWThQktGVfwtmdgy14FEE57wL0HyoKBHzj1gMg0n+6eEQjME6iKHaQLzM09Nf4NgQA= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H3Qwq7WQCEPnZ2Ac6d6bXTwWHERwCsuSOUuYSsQ6DZP2A2zuVr7WRLxfcTDuX110JInvCNjeetsAv4645cBTr6Myeg5XRxehqmhP8IGe56iv8reXpCEMfupRosl+YvI/1cM2bgAZMnYI5+gSipK2AXFCvpYCnEQgs8CyBw3FeH8LRRWiFMDXv+q/LObBxWTFb0ycZU6f2EBbo1EtuwW/kO2I8YDgfQbE6O+Xq1IbgrLGMP9H2PRPrBEYC/U0tH/p6bczIyXW65FxgRohbmeo/QY3DbOpJNu7HWzDJI5MVd5T12t0l7/eD9X50wTSHHtTD+sLMGay9cm05Wzqivw3LbvsFaR//9hIZXZg51WL3Gb6laG9cm3kC3vwCbzYgfvSC19vaVgT8vRGxsitibe8m+Fx8rU4GW69kA64J2v1Kx6YeCSTNY1ArA8rOLfdZONO6Pujr3ge1Vei4auDH6av5jA0Mqv3wjlplPT/Kix94EJJqtV9oWp8AOd3vqV3VEJmn7s9bA0+oKQEsw5u2gs+LjuYIps9dWjcAvCJB9bTuL2m7aPqQFyaqXwE2V946pNJQo6ALl31g0QP3VeQpD2dRA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3JvHFBLPbzlHusMtR/EZ98Lklv7NAgouP5Yz6X/AYYNkX2sRXcjVDk1a3x7lTx3VD4Dnw5VdmCIb5EKyEqE+A/puJ0sV7KAs2e5ZFYqRxypJfJPm12c/YKFMewEyKGZwESd5/xwt488myzhZBgY15PgLNAMkgIrj1d8izhSiEw1h/UXQAApNaQ1qE/Ymno+iAsQ/XLqU4dqq3lhmRKylIUhHc1LZcT0o0Sx6Os2z2drHk60QP0ON04SvEKbMD48vqNhVUvdtc5WpI43GncNxjVIg0tMEhENo8w8gb/nxXVNwfN+GobrXSWCFuL+/7q2lsuLSix1NCrCItlkaG92nb9WI7WNLl7UFjtvp07XX00KC0U4R8D+Y9TNf6FxapvLfC/6kElox8ofHtrl3bz/O0cdPvBsCiubIOdev2jxFOAS7jL4AkNOj6y9vMnCKZODrBBVzK1aheotKB+X3Ur/Zo2YA99bj/ph2Tj0YcsIf9uTr1FsBzOq7b0QnQySWK9zuaTRNxXVHpdx0Ej7w3gNbc/nd0ThQbDfHSmo4kNr1ZFBks8ETEZMKZvlRNf9E/uaZ8RDm0gH2Y6n6f3221fuxo8jzjz4Y8k9vSb4eVU2IROC5RqE6eIEIynMtMIDkbPLBG4gchRQZiK0uTT6pVc2VuKsvPSsGxIscdExOSmBY6EyaRfnZsPZq7NgjuJU0Ip6eQLCRJ+LasmChepijtng9JMxrIZH2TNNbIGDDa8KejtplI1ksg5BWMusqzbwR45xDX30mtgeEVbX9O26t5jbXuBxEh3pjxJhpSA4B8b4+U79LJ2uSDNZaj9RQDPfwY77TI21ObLYT72WmzRxUGQjFe992QBkZLrTyxCH4yXLjpALYpbdZgMqMEp/b2SmUUnG+EUgMJC6EwGmCUdYRSa1Xi56iWL2CWWMTwi+S9ZZRHlalrqM+AmBoRKOSy2K6IMFlgybNZ46RNHfI0cuXApZFVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f36382d-c03a-47b7-ba29-08d9df7574ea X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:09:41.7374 (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: VI1PR0301MB2557 Subject: [FFmpeg-devel] [PATCH v2 02/18] avcodec/h264dec: Move pack8to16 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: IAfNjgA5iQJU Namely to h264_cabac.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_cabac.c | 9 +++++++++ libavcodec/h264dec.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 040fa0a257..884d392022 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1281,6 +1281,15 @@ void ff_h264_init_cabac_states(const H264Context *h, H264SliceContext *sl) } } +static av_always_inline uint16_t pack8to16(unsigned a, unsigned b) +{ +#if HAVE_BIGENDIAN + return (b & 0xFF) + (a << 8); +#else + return (a & 0xFF) + (b << 8); +#endif +} + static int decode_cabac_field_decoding_flag(const H264Context *h, H264SliceContext *sl) { const int mbb_xy = sl->mb_xy - 2*h->mb_stride; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 1128dddfd1..dffd723ba6 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -685,15 +685,6 @@ static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) #endif } -static av_always_inline uint16_t pack8to16(unsigned a, unsigned b) -{ -#if HAVE_BIGENDIAN - return (b & 0xFF) + (a << 8); -#else - return (a & 0xFF) + (b << 8); -#endif -} - /** * Get the chroma qp. */