From patchwork Mon Jan 24 20:00:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp8209iov; Mon, 24 Jan 2022 12:01:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBCyeBVSi+9XlTk6k/DBYuDlYd5l1cQBIZcQh3MrAnrw6vpB6kb+i6soqdG1gYHmS50Ma8 X-Received: by 2002:a17:907:9722:: with SMTP id jg34mr5007391ejc.757.1643054467399; Mon, 24 Jan 2022 12:01:07 -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 24si181401eje.481.2022.01.24.12.01.06; Mon, 24 Jan 2022 12:01:07 -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=fXsoDcys; 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 71EE868008C; Mon, 24 Jan 2022 22:01:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066012.outbound.protection.outlook.com [40.92.66.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD61C68008C for ; Mon, 24 Jan 2022 22:00:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XRVcdFXI/H3tmNvtU2oD9n6Ak2rFoLJasBdcTaTzy5o5gee9CcfSv6u8GWUbdlPtSvNV5+CfxI/ZOgxfg+RgSVLL71bnrM8FFaeUjamoTI+7PXtV0pB7dx5HCMZf0Ioy0m+5UcoGT5f1SYqG+IevqxPsMwp9gbuXGsZJismIukVlbDUcivn7s+s5eTdUlhE/lPL2h2qFklaX0/aLosCeoiQ72dfSa+f3u3u1iNOlCohuhXdiAqL5lbZFxCqYjnK6/+e+wmRRXfOUXs1dtL2klS91Ia8eUHWGV+YBhtC7k/8yoLAzjv6Ql86aaOex4IcAwzo+mbeJjoYh+GSg5hgW3g== 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=nnBMQ/wTb0+js+lHn0rI3PIyiutsmF74IU/mXZkCbX8=; b=HZrpmn3bWfl7oGwXhj7joXMc4Z+klGcPee9fzEiOHUX37lBjWO018747D5ctXpfzRrMCuc/ts9T/uiIhNSEAvAWcBC+/UN7fWLMsUDHpWXC0nq1Qt/RtPWavE9RblR9OMiqchZGddzZEgRwr+UYJcwF+osv9DrnU3w3sxn9B9Wzxm+TR7MuEka1aPgWQzZzwiyJa6tCH52sPoYykjqtuQRPXQLEk3r6JS4iCEo0GBBPXZsO8Fu8+eJAHkrrtKyCtxHmSxFVOq9HKGplcBqzkUbS5kjgJ3oBz08LOZ8TNJ9UX4tkDpe21ecLXkOVrmyynU18o8X+cPIgZKuy6+qt8EQ== 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=nnBMQ/wTb0+js+lHn0rI3PIyiutsmF74IU/mXZkCbX8=; b=fXsoDcysw4tSEfcIqZZ45+NhthFGalTNXX53uX53J88bojR+GUOSDDjXdbBa8vJNJS651nToFyF+hjzXGBhoslOXEp9jfwtWtpEjV1xUIyo/siKlW4pK7Ll9v/iQqNXM8pm4Zbh9/BOhOfgC/mHtzMZGTcBTQ0lJodMdhx0Ffu9cT9j4PfvR47ipastPLJ9wHxtaNWCL3rt1FSr9xxhaSsiH2/x1dB1XVIzJPz56kLRnxD0rakHquoAwzG8Ww0eCSp9X+iOVbwwW5tG30GXxLduNOBQNeV8mFrrEjoLdrkVagVE5z2v3Ml6HtozZ33SHLbb+1jK8QNP8UyY5pSqi3Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2545.eurprd03.prod.outlook.com (2603:10a6:203:9::12) 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:00:53 +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:00:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:00:28 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [1G6wZ59pDo8BDJTJOxOoQ2gPITpO7OGi] X-ClientProxiedBy: AS9PR06CA0269.eurprd06.prod.outlook.com (2603:10a6:20b:45f::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200045.592985-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bfc6dab4-7a5c-42b4-37c5-08d9df7439af X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxiLHPmPpGKSzzgSaXppALPrzn9FgDgAb4rdISLQQ2jKJ0oFPph4r7uDXV5jH39XTxepzQycB7p513Clt75w/qEI/d1oIzOg2cV5bG1+qBeHN0gQDx1Gy8S2ti4cn5W9IfukoFoiO+3ksIRicPSnQ2ZuCFyGs+Bu5lXrWaJzDvKFh/4Y9d06HgKzzam8azMAhTNozr+Y1vId/SVtWrFu/aHwAYOvh+OtjLocykJfFObz6Rk8EkI9aD6m+d8pYvu9Ak1cZ4qF6yrakzxlDhOikb4IyAw246N4K8qldp9Mt9IqHpPvCIkyMvxohCpqSuwb9xi4Q7oJJWZ8QC2iRVtDRRE0iFHBPw53miJJGasrZQ9MZPesYfoc4mo3xLgCHx2NLkKbk35cvaqchdws0bvwbIpE3CG1oSjvNAjszocznahe4E13vSVx80fEUz+iZiGrqFdHvkeaZaDzh8zMstjyldc1Yv4aLb0NA2R+eA/wv2dJzVDP625mbRiiLdQNVWWraw/ltze/bBSl41tCf8BeihKPTt9QR+fTkYWXPzF1w+d9f6Y753r3tI98HzEv5ACjEC9uHzhsJ7CUNVQFo3nlUn3DWuQuxFxgY0EGSUo5+RJLo4ymWRXBTsNCpfK+1IcsUzM8actHeX/n7IRdhStxZplKn9VQZPbF609ilpUyIhj9CBMYfNDbQSzwN4LgZqP2CIU7SmUqjcau/kQg8miIv/Qg7My2a0p21pgUvw4IpxHus= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2545:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M/CWRooZ4ys2Q5cWBaGeV6fPmWK+ht04llhld4bA/q5jMtBwmbvXxKyfNjEVxi49qJIRMJaFt7g01iwJy9pUrpYkpPUxoWEYS5AfIR9QMEUiWFJ/Zs+QC8xLBdrjTz0nVlvROU/CLfVyIRMd/iQU7mMvcS0AwCtQO0yCTuGu514WkU6otGwILJoHUdtConb2g8IGjqYket9TIetcpWKLoC8GIfLjKjN+k8Pp0sMcTi2rPEeYI8c8z6c6Wue4qEE+5HsckOwz20K7tB1MDMmrGGpV4esk2fEjoxRAWjIaQXJpyKrhWyIccK9osTMSXWl2YH7DS1SpVF6sjn6TizXmjrj44IN+BLfpOjiSFd6XMbkiXR0wDoQe/KWRjoEZpnkn6eoxaV0Rcu3rwl5ofoX2GJCqZxldumwNUnDMtAx7zhXT8JS1Q9biNC4rwqXNwXXITsldqxLftz2rV5VBU72xFcCSNjJ1WhhLYy3Q0MwE2EYdyQSwnJJcsGcjMVHi7xluKFuBpuO37+WJYjOIoFQ546TMBHB2FhoD0DZkevQ6/Ac0imk7jBaOU24qF/He6Xa5Rc/R1dgpTbEKBpc7dUaA0A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s83RU3oku+VDjNdqtmG4RKZ0dUYX6g1zdsiyQoAlbnpM+bF7HULgdSGXC4zhi00KzLYV3UDlvUpOBn6uxusxF1BnPV96+84Xjl8dx20wly9t73+UB7MoSzSLZGkAJz2DJKn520fYb3bX/8qWP1U9Go/7ZwYv12V4st8ywxCKMMkCF1CDaNzE3k67uk1h4dqJlzsrsuAE78YQHyHex1NZQuhtasRh+axDmhzG5s0QGWLKvJUUyoILyJvSV0Vx34Oht2Z7mwRDqgDuiEQFzh8XPtaREPZJClsw6ar+lvUYyZjIjRgRFBEj91OT4zyW+f537LX4GapbuzBr+B5us3c29cxXQdVSgZp0HCBr1UmNMsfWOM0Zbwm5kOgTZ0gE8DN/babwj2ORfasz18FCL6c1j1nO1Wf+3MbrhauAqCXB+ORw8hfJQjHB2LaL75ohNXXorcsITRPiP30w1AERLfaBVCld64leoT4idOlzl8gmcaw5588F4WVMd7ssjvrVkTTNz29QUtqo1Un/2hx7TsbjvR/GBEQBcd1uESAM9nWBlJqSdbVygbkJjkPdiYnWQq/e436R1vVcmu920uhmQx5PMJf/VBnpeT4Hza4Eu8EkQExo5DdzydkqJVNk/Al6LEZcCGEKD8uftP4lSOsuHNjRxhfJES4MAWrs3SqjL35bJhJ1LCc05AoBZZfU2kJjkxB+Yo2RqAsLl/qyajW8HLg5yRZ4i+K8LZsNMCigUKWKE2KJqncH9qUF7WZ2RNq6Gx8oEBQqsVYwGdwquHAvkzcvIowJGtQtK39Cwqt2IUOBzVOZ0YDfKV/C57XvP6yxCt3NNBHC3I5YKpJhCgbJJEY3fWQoOzrT9t4cw6ugA2ALwHhnQrI3m6graKD5/WtBl8KZE3IGSN/d4Ni258LKJxSbRVYtIrECIwiF/Rl2LMTr3i4iw8+3yUL0HPy3ZDyXdWQdrgGCU2eYdD80GHpfcEVpmw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfc6dab4-7a5c-42b4-37c5-08d9df7439af 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:00:52.9120 (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: AM5PR0301MB2545 Subject: [FFmpeg-devel] [PATCH v2 01/18] avcodec/h264dec: Move find_start_code() 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: kZI+/SK7fEn4 Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_parser.c | 9 +++++++++ libavcodec/h264dec.h | 11 ----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index cfbf6f4486..881cab7536 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -64,6 +64,15 @@ typedef struct H264ParseContext { int last_frame_num, last_picture_structure; } H264ParseContext; +static int find_start_code(const uint8_t *buf, int buf_size, + int buf_index, int next_avc) +{ + uint32_t state = -1; + + buf_index = avpriv_find_start_code(buf + buf_index, buf + next_avc + 1, &state) - buf - 1; + + return FFMIN(buf_index, buf_size); +} static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, int buf_size, void *logctx) diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 87c4e4e539..1128dddfd1 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -44,7 +44,6 @@ #include "h264pred.h" #include "h264qpel.h" #include "h274.h" -#include "internal.h" #include "mpegutils.h" #include "parser.h" #include "qpeldsp.h" @@ -833,16 +832,6 @@ static av_always_inline int get_dct8x8_allowed(const H264Context *h, H264SliceCo 0x0001000100010001ULL)); } -static inline int find_start_code(const uint8_t *buf, int buf_size, - int buf_index, int next_avc) -{ - uint32_t state = -1; - - buf_index = avpriv_find_start_code(buf + buf_index, buf + next_avc + 1, &state) - buf - 1; - - return FFMIN(buf_index, buf_size); -} - int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup); int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); 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. */ From patchwork Mon Jan 24 20:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33816 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp14874iov; Mon, 24 Jan 2022 12:10:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDKNueXCZ2zcCYhcxXCaxfnFcLcSIYhNlpOh+hEbF7zInyRm49LpCulIEkBs0CUNXxfe2+ X-Received: by 2002:a17:906:b786:: with SMTP id dt6mr13571855ejb.556.1643055002264; Mon, 24 Jan 2022 12:10:02 -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 z2si11246373edd.605.2022.01.24.12.10.01; Mon, 24 Jan 2022 12:10:02 -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=pvQONbJa; 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 79E3C68B151; Mon, 24 Jan 2022 22:09:56 +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 06AB668B116 for ; Mon, 24 Jan 2022 22:09:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONLFZ4nlknl+JyrkiQ97LOsX2rBItBCY2TnkcPDHDj2Uq8+qcP6FxHyIfdRYw+NqoWWOYmdDjdt9wdGELx6vXQJl0snHLVRCshQWFa7l2xhE8Fnw7AvZipELkdWeTDZxMJyCwFsieSQicN31yenlSO0D5j1cdtUpkLjxVnXvOj8/7AGMfykw1gQ8CDqLuQgx3wxfslEmBHQ4oYvNK+5z/hYWZ9osy6wU7oQSzMRmmoTxOXxzMI+qqSkPGLJhqKU7X9WcFVk9bSw1DivwNneCe8a20hMmBkDhHuAc0EET1+VK+0TogA+gaHGteecCDP+/XJqWaIL83PCXTKG3DGlHww== 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=imSfylwGAocJCnAVajs71y+SRD9j4I1swiV/sgW0PG4=; b=Lx+zUs2cjYyv+PHq4H+/iwJnr6O2H3Ow+MyAnMLse9HnEQbdGwNkWPEDziGFfepopKJ7aJJ8NdLxnPoPGgNfqlpG5wQ9BF7O956J/dtnjQt5h8IOUeSod9Ywo+NhLBnHYLhoITwM5n6sNlEWF69hCix5FNcgNV99IIW0P/6nk93Jq3Jz795NUJwXpP9AWSJtmIYHCBKMEBRbOwNTdxtm42KIQlHi/oEE3GL4Wvgzb741n1HhHwnksg6EyYTdIN4o7laDtiNod05sdf50RGuaCNhjqGRKGxXJxo4zKwcEVkuJ00gTbNSZ1cRqiwD96PMhyfkxpjQKldWUtyGHCgxJ4Q== 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=imSfylwGAocJCnAVajs71y+SRD9j4I1swiV/sgW0PG4=; b=pvQONbJafK0RB/BJbP+IkWwTxWXryKULzkIKzUKBgjVIcAQSwBdMIdDnzagzFZGH32c0p4T0ycp6JQbjqZmenp8c6Jwcl8TKiJ2nINQJYIfAYJsDgNHS+Al5BaEpjuBe+J1cZjHJj+y7NToe/qCwkYdusrLwcJtk86IrQRCPb+Vp92Dkx8rccbT/v2CiaIGLfstaSqOjjwu0nWeu6YSgpzIRh1nsfDZlvL53Is05oZDX76USRkmD+Xhq7SFSca5ulN/p4oE5CG75JNJ8PJ/XafrLG6TMJ5HUjM89iXOO6Ndso2COme59sLuCSSQW1zny/BZ+HMWn9uHXQsGiL37U1g== 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:43 +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:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:16 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [CQQOoUGdBGN++RiPfPKH9tyLtzfmxcPQ] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a5e9d5e-b4cc-4239-bf91-08d9df7575d6 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WlQqSnmGTNR4+IgJNmgTB37ggqGRfID2aIeJBuyfzAMyIClkzFbT+5tIbskBAf2HYlvE3Z7tscOk+WjTn1+01XqZKbCDKcrvwkjqwmC91u7T3s3LWTUpOSHdCXz6MdDLKPvN2BnaPHKXE9tNsslrd+UoY14sR0TE9QDAtbxsW0pmF0agQ3b7k0ugIZDdy+c3fIUO4F+NT2itinezZtNlDWEq3W7nEUjakcsnBmohovF7zh/jbUtZzJQFiD4mPWmiibv5WJIK0Tql++AxjrYRbHC808rx1aWONsQNjwRCjoDOzePpFqPJWwJTWf/ZcNLtOfOY/xY1ixzph4CzGL70iUzW0JAfaWvP2JS4vPpZyn1vzXGFvB6WfIWCjr+A2I31fUf5ZQyK+P+1Hn8aL0C8ccsdpokl7aiYieHEnpYUpbhV7Sm8vI34OhiJHt2JpoukdzcduBTknJ8eqbonyR8JxlgWPAWe/Nl55zvwZ7HW1drEwXkMeoMCuF97GOXfZyOxUTVYrJc2rbSVj867hLxyK1s+I3NWI1z8vz5oLutCeaANyD5i1HLMuEHg+xa2q3gMB+FbUpEz/c0w0BFZZ7WqAQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ntn6014eaYBOxYv3+LqrYJ4T4+I1ni2gFGmEoKlyEBG2hTnpJ8oScpXJ1yRiI06kZOa93kARpzlUh9YK1g32lf+zQxsjTI0FbgIBVSpx3ws5YdSXEynPvcfknnZau136yhcWr7RB7Y8O52JHo4Im2O/4g3cIpZw5eopY+UuxeRaT4tDkBbG4meW6j2uU/ly1+TzT78ROL1wjJ6E2bptvdIwh/158QoByffQ1pn/PH/zeKVf1F+KCOD2pDGhgAilgHgu5puEF+CvXV8qJQHeJKxbQuZDSfGu47ra0gaJ+iazt6IzT8v7tyedKuY7FFZIlojFu+9r3Clpfnc1sxbQOTqdQoMi4wCdDIK+nakqFdgneKPY87wKElShk/lmwxZrU46NsR8GfnEalt4muxvE8NW5h+Ga6KwDpEU377ZfJHpIB5MHW6TOv+0710ey6mcgMGBQfoz7geQORwnSd8K5ZuiQ/qWCn/cZEOAAy3TiImegQJ2ojJvMvpRtVZxLd3gQx47FK3u3nh/8/85UdBs+rinzT0+YpZ/yWi1BEXZw7pJ/QpwfIlV1xFJN6zn70jbVV4GTjSTLM4x6VVCZpKD02XW7o9pmPB5pQZdKSJkhjPg5OH3z9eWnODj4yGqlaK9QrxCseNF10aXMPZbrdKvXr5OjqQJ3N3RZLv9VY44nxoM4HiQY72aViVS+FquptdgTeg3eJ2j4Lw11TMKA+hkweJoDv1vQl03YUJYhXoD3GQ62lxfviwqWxKMJURHM23j2E/T5d4yLsRMO7qOAqzG2znHlNO1Zf7qNvsvrbX72SlLcjHn9dnKY/UaxUySWRCovjLkioKcrThZrcLKt7E0SAOVdFKL/FgIIHyOXi/KRfTSx/OtHeUX9Ia7MOi/jQEUzt2YRUlDe2OqqVQxnUK++nkK7b3dYaAyWBZ37nVi0zsAjP4H0OJVHGpAIB1c2qC7fUQd+CJWRGfTg/tYbK52jAQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a5e9d5e-b4cc-4239-bf91-08d9df7575d6 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:43.2842 (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 03/18] lavc/h264: replace MAX_MMCO_COUNT with H264_MAX_MMCO_COUNT 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kkU14PqNoNHK From: Anton Khirnov They apparently serve the same purpose; the latter is one larger and has a comment explaining how the value is derived, so seems more trustworthy. --- libavcodec/h264_parser.c | 2 +- libavcodec/h264_refs.c | 2 +- libavcodec/h264dec.h | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 881cab7536..aee7cdb934 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -219,7 +219,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag int i; - for (i = 0; i < MAX_MMCO_COUNT; i++) { + for (i = 0; i < H264_MAX_MMCO_COUNT; i++) { MMCOOpcode opcode = get_ue_golomb_31(gb); if (opcode > (unsigned) MMCO_LONG) { av_log(logctx, AV_LOG_ERROR, diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index dae8bd278a..93526b11e2 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -849,7 +849,7 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, } else { sl->explicit_ref_marking = get_bits1(gb); if (sl->explicit_ref_marking) { - for (i = 0; i < MAX_MMCO_COUNT; i++) { + for (i = 0; i < FF_ARRAY_ELEMS(sl->mmco); i++) { MMCOOpcode opcode = get_ue_golomb_31(gb); mmco[i].opcode = opcode; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index dffd723ba6..38a4e96e26 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -52,8 +52,6 @@ #define H264_MAX_PICTURE_COUNT 36 -#define MAX_MMCO_COUNT 66 - #define MAX_DELAYED_PIC_COUNT 16 /* Compiling in interlaced support reduces the speed @@ -330,7 +328,7 @@ typedef struct H264SliceContext { uint8_t cabac_state[1024]; int cabac_init_idc; - MMCO mmco[MAX_MMCO_COUNT]; + MMCO mmco[H264_MAX_MMCO_COUNT]; int nb_mmco; int explicit_ref_marking; @@ -489,7 +487,7 @@ typedef struct H264Context { /** * memory management control operations buffer. */ - MMCO mmco[MAX_MMCO_COUNT]; + MMCO mmco[H264_MAX_MMCO_COUNT]; int nb_mmco; int mmco_reset; int explicit_ref_marking; From patchwork Mon Jan 24 20:09:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33818 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15103iov; Mon, 24 Jan 2022 12:10:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNcfp1wcvZL4wrNo9vddgAAR0+3gfsFsvZxW952H6CcFAYSqxHBWrFbAPUHhgMjKg79rc8 X-Received: by 2002:a17:906:4fc8:: with SMTP id i8mr13798704ejw.427.1643055023128; Mon, 24 Jan 2022 12:10:23 -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 sb10si2198032ejc.658.2022.01.24.12.10.22; Mon, 24 Jan 2022 12:10:23 -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=Tz6R175j; 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 63E2F68B15C; Mon, 24 Jan 2022 22:10:03 +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-oln040092065021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 292AE68B15C for ; Mon, 24 Jan 2022 22:09:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzjdBBMgjdJ9ZCggcLSlEuk4+/M58LG6NFVFKS33OiNVkUdmUEg8PWBRWkJ54TWiXFtgnI8L542oYanbNsOp7Jcb675Ab1lbhKBEmwcjNEBfGhMiEwS1GRwKHOlhdUNSgsEZyCLXnaI4MKvOqo8X+f2ytx81Pit4EroPeNTdhONg4F4PEGdnqBVxT7XLSW0n3VOASK3HUVi0JklfbmoozZ2hM547aw6KThm8KNDEB3E2f/QO3dnOqmsmirVMUvp4DTo51nCMqZXtcZMLMKWuN5fFkmLn7eRU8tAWJSh1xNb2SnXSVfHIYNE/VkFEDV/ZHnhJHpRGv1h/qSmPL0eioQ== 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=se9CeJGK8eDykpCllTLY3NHi7XsTiq+zD6reLPj8wOU=; b=g2u5TGAfGdprI1K+9WZjM9CbQC7D3u7pP1DWMrZJKLF8D5TvKqg9OBiSCSDdrsk2lOOjzcwGzOKS3BSmrp0u071v2SnNntl/1UurAoWVlFDyh9dKK6ncnwXdTabdJyikivgdj4oC27vh3L3/alfrUrQDQmE5GjQtdzwj+gI6oRKEDLbtcJ4G7ySLsNubHMFmgmD6pI5wFe3nSLOUUI9q5g3rJoQIAKMfJkGiUsF8bHb0MaDoaMkstDFv6hRzop2Qiebj/sT0rdwpDxrfthZSbZgIVIjFp3NpVbF7Mgm6tPT4GhDaG3mCvRSFvAesRjVusbV1TiuRFvkDqct2RXNDTw== 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=se9CeJGK8eDykpCllTLY3NHi7XsTiq+zD6reLPj8wOU=; b=Tz6R175jbGtZW1Is7uz+dZLj2uUeK+/h77JYsHHrypENEROmXCrdbz8kPxd9TGJ0X7sq2obOkdZ0vSme15q3pUDtMCP0ssh8MTjecJ+vgBFUIGWVOv4HWC+dMRF9DSYP3MxJgYOwrNHLvPtqZBZC3t2o/UIxmxZWwf+qhZWmuoH1BmhiMPQEXmnGH32zkAqkja0VsGSc9V/z06YgUNNX9TSTFiFaaK37toh1Rtxe07YbS2uqlqPYe4IUi5PzNzvOshgAFVC7ofJvewCu0BiUJxpsmThDOREjSkvi8jtakQH3ybYcGYcnJhVvrLoJb4C82a4WbIdbff6fz8X9EWoekA== 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:44 +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:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:17 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [Rs6cKViNYesyQSsxI9PZm8w67h1TAc45] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ccfc6fe-1ee6-4ea2-8ef0-08d9df757682 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWF1cwvWE0ht808td9DEaGC8uXzV6xPjYpVNNXswRvPTtDtvLg5+/Jl4b7gL8JdX6LpFoRA35K63mMnuU9bEk4llTNI1kFdxdqtfmIpK/6zuoSGOvt7vrI5DGVSI59uIh7+Mev78w9H1Sg7OfoTnruPcD8GS1A0TGIIDBWVRl6GNRqsOoxUUEduQDVxkrhRJp2bJcURySFAYHSdL9s96SRuzbj0DPaULz52554KRVeUQ8OVe061+csKX6LfHa5mX17uPZLO1YAH+3JpTFy4DioJvMnzqHai4o8EfDIB/GRW+hY59JUnl8hnpwK85ipOegJvk/YswayCd24C/1hIHNpTIBKW/1d60kmomyT4mLziLpWvCLqPkVl1/OJkW+OuqqoL1lPualFVt0p6e+9BxL/i0PCwpwCPMntpYLJUc4DRdbuz5dqsJMT0/SeJDEb/gY2E2JsVNcT4h1PlxZp9r332KW0diQpM1rcmwst8JoF7EmZan1vXUBdY/Nu5qOoxk1T/k6+AfQFtqbwAzw8ASXije4m7oU3CJCS8NbOnqanO9oncjZwlqhy9xoYQkV2aHtGPRgXbiEP8cUEqiuma69g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 53CWKeJSFiY5vZAMRKOwi57s7irzrFC/Lfgy/jIY//LuzHbLC/LGYxIHJMqghNAdnEo2H4vaBsG5Us/ajEPhVGgrjpfagOe6SW86O8iaSTs5iEHaNmmHXYrvCoYvgctidLS2jhT8gXxl9R1iyskKk2En3P0/BbzowtCstvc9k4UgyNFwh43/r/OO4cycpENXjODeWIfX4y5/E7dB0ArAFP9hGxliJD53dDQr4Eyq6Sa0o6rE2aQPDKFqRGluh5iPsw8Wt6pjkR0h2J3oHqB0uRmpKbngUaaTQ+LZ36WP8xC+4lbPYR2+zG/G+86rm0A2RnFwJtztX7w52WixLlZQFpqJn8YZFasuW/LV5VM6tCggT0hAG/zP1U2K/rV23N9r6cH233XW5i45M50zdClja+sYTqGov8DFKdT847/b0ou4cHHwrr2xHJL77/KNFfbyWLAJpjLjMtIQtoxnwGvoQo2Xq7maO+U5JJPPM03DdjzxUd6g9IGdok33IwivrtGw3Adntf77CnVqlnz7L4SOvX/qulE0Oeu0FSe0ejgrDIS6+OiGNmfc3+rSW5Q9U44PD06OryaanwNvviPI/RARJ9k8ZTL4B9Rja0syBuAKfWIBleu7TshqxLWlxbFynXgiNZIzmynePHe3/IsxHsx3b4pqDfigxPxdcJWrnOLMKuZE1nrhRUlO1/fP+3ECvs8VSN7wldMJ1nyq9J2BY66Uhpz9Td8bmi3QN6zSXLcI6sRvSBDmOFCvirdOQscsaLrRnQB4y6alqUPDshoGi5CsFTLcRL/Qq9+qvcxmcnrxxW05eXmdu3itzGVi1jBL1x3mLFUW80yQrBVqy+bAeZXTyKmk+aWV/5HE7RYhbLUXa7fa6n7Am1+z/eHvtgQi+2K633lx8lszbDXfJc2WABZeY5AhYbcvC0sXebqMaylEYavSyzJ+jPzWYbPvsi+8P5rNHPwwp2Kut2vPcqHuRWJPVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ccfc6fe-1ee6-4ea2-8ef0-08d9df757682 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:44.4102 (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 04/18] lavc/h264dec.h: Move MMCOOpcode to h264_parse.h 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bKawJe9An0iQ From: Anton Khirnov Both parser and decoder use these, so h264_parse is the proper place for them. --- libavcodec/h264_parse.h | 13 +++++++++++++ libavcodec/h264dec.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 4d01620125..05732326d3 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -27,6 +27,19 @@ #include "get_bits.h" #include "h264_ps.h" +/** + * Memory management control operation opcode. + */ +typedef enum MMCOOpcode { + MMCO_END = 0, + MMCO_SHORT2UNUSED, + MMCO_LONG2UNUSED, + MMCO_SHORT2LONG, + MMCO_SET_MAX_LONG, + MMCO_RESET, + MMCO_LONG, +} MMCOOpcode; + typedef struct H264PredWeightTable { int use_weight; int use_weight_chroma; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 38a4e96e26..c7662f930e 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -102,19 +102,6 @@ #define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) -/** - * Memory management control operation opcode. - */ -typedef enum MMCOOpcode { - MMCO_END = 0, - MMCO_SHORT2UNUSED, - MMCO_LONG2UNUSED, - MMCO_SHORT2LONG, - MMCO_SET_MAX_LONG, - MMCO_RESET, - MMCO_LONG, -} MMCOOpcode; - /** * Memory management control operation. */ From patchwork Mon Jan 24 20:09:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp14993iov; Mon, 24 Jan 2022 12:10:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3hl3/3MZQavi2b1AOtVeLKwLyQZ2iAb5NUxcPM78Jn1cdkiC1nX5IFRGWpTaqpAbD9bpy X-Received: by 2002:a17:906:c2da:: with SMTP id ch26mr13825686ejb.372.1643055012343; Mon, 24 Jan 2022 12:10:12 -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 gt20si2372824ejc.694.2022.01.24.12.10.11; Mon, 24 Jan 2022 12:10:12 -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=Ocm7cQvO; 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 6E01368B170; Mon, 24 Jan 2022 22:10:01 +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 326BE68B149 for ; Mon, 24 Jan 2022 22:09:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fiVm4Aucs7S+ZgjTg00R+lNn8ZhIz9lTZvkZ8F5IJtI7AYldycmkPsm2LbjGuA2YDbwvGqUrQKIgBp7FD0EYIrjgLMoQqR3qhLnPeg0+MCUCnjigNIJrn+hhF0RlK6P8rnr90D3qwEz5XA7pbipPVcQgSbe7+bAcT7w6+siRt30/lNIAmdvvXZI+XliwlCr8rWYpPl9HuUD0/kVJdIYoU+/Atc/aPshDpGd7Jd5xM4Z8wIa0EWBvy5f35kYieKCMRwANxTn7xkDxcy7ZQaqJfrXobarFeP1yhj7a3NNE49kTkwfcWUMHJl0DtfG7D5ImKJb0yjiWDUyHp2lYWwYGAA== 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=MKg8Np42bfX6Uwdm1bhV+rZE7f9hpYo+dtBgmEK+oOQ=; b=gnTvSiiNr9BTSIwC7R5LaiqzISN7e5sYsi4LkqIt3HDXH1r1yKTApWR9YTh0kclE1QgKFvYcaaMe/tP1fy/D7PV1e1408xeigtzASXy2nd99ZQd14ZMSeXEJZ3egATi9soz8bvAMt/Pt6v9m5ASbWguuJ6abQFa6XWTKT91EuJygcCb6Zc/5K83zI+kOE7862GewbXzffWQdNaMe4fhWx/y7oreN21EOx/SH8DHlGdMaOJuWf3iECHOgtLXpH+X6IC112u0P4H+54c9GBMglH99KAaeovqbYL1nInaiNNt9z730QBiBn3HY3+p0nm+Z2em5L/wXvrZGTIlL6dglWbA== 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=MKg8Np42bfX6Uwdm1bhV+rZE7f9hpYo+dtBgmEK+oOQ=; b=Ocm7cQvOKW7FqC0uOBpVm9AOG9HFeT/xx7jMlgwgpQr8n0xIUsGPU0MG5fXbF0+GbkMnXPhfslJ5mG1aTtuGTEH51W6M8nXpISVxMdNodCiD1km3kZZVxGE0b4de/lmqB9ro6DOKneg2/Nbe5sSLkVFVIqz0XVvUOg5q1lQp49fxnALB71hpHkbnki4eib1ihOzUZTEYxDttikwizihie4c4F3EBO2e1S/DWBYdDd/0M42jUnAsNbX3D7lVj93sqZlY4HLAScDbTQAhdLHFfIFmUo/mMV8lFbMCttKbzQn2AevUcG419L0PKpYYPMhTw1sMHxwKgAy1Ami+cog5WKQ== 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:45 +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:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:18 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [RpthcL6A/T8nCP/vtmQwsticvJfaTIQn] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c03cbb3-17d1-4412-1ed9-08d9df75771b X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YluAyDVndQCCP2HvuAbDezY4m3pN96s+hnOQmyEMmNuxJEO+2Uc8NqK7IoFpG0YYPip9TXjggf+Ae9G6hT8bHORTZvE4b/mRFVTNqR4yPDhTvqfmjNqtOV9EQm0/L7W8XJ16P4vqs9XKd+TW0nKtOt7t4kIknAlcgvS5mZtVuoOVXrGl2BQWFI1msGyS6OAREBijayQFW7r6ApLXUWq/z0j4M5BjOozg3LLSepPTi78ArO9aMzz1T2f1Vu66TtGI+Qh3j5WLwiDwUuZOjP3ndZ4hEohMjMznVMv72GKm1NC1SYnawsnkORyT7asRRLDRdk8btZhtMRmF2vCgkP/nkK4heY7u5vwRw1ddR39D6IWYON3iGmIkCq/boisDOKzk7ievDny4yfoV4Lc6EScOkrZCrmb1BF6ILPb5DsrsSPQrMP3YYHW36z2foyk1ml9MGP/h8eJaLvOhMM5utmNu0CXOf2ri/WfdaaMqMzuFf13wB5DPHnJ7g3dSa+nW1x8GgdsfFa9fQlk0vKcM7a9WIpE257nJ5wYE2mfJPE7PD92a3jnKKHau4LMaSHFKHWmD0/kPLqfnFTaX2olGrPS3Mw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WzQfKTKfc/qNrZPiZzIRFJLhLcrcOd/wnGl5pbQFH/A5+XxvLS6lQnoTHRxWleiWPFN2rB1oM4NunMFk6kQolHmLZnq6nYwuGb3rVhgyGuTLGNPQJO850MURM8iAz86kTHLghF509tO9uz6CvCaGYVR2lv85o3c8ywjXUu4qfSyHhvuFw5pPQQrgF5STA/ZYl51gDyYwiSQrElV78P6n3Y5nlMHyNU5YMrHQTdSY2w42qIeLmpoL4HxVG+5p+rAYtlyIbxV2lz1L55xyI+JDnkjEUGcn5xUClQ13dXk8qH+1kspZ4Lot3n4USAOu8WMl9ddPKmfX1wo1iPZTKymmb7pEYOHFnC11yuQTP/TWLE2A+kvELPBBLEsdarjOIusZ4l9Vz1iCTsPvkKAzsWpJYoyzop/qcjxbmXzBn8TklmTcAI6uRb/ezDHLXhPq1VcP06f7+fvfmZfsF3+JvsU7n9j+7VA48x+I4gsEbQxzl3W99f5C26d9l3sAZQLizEYqEARFCeW7u4LXFE/S9fpGrZTdTZqjArxWYXzaZZ4k2WA0ZRdFQwXvYZJUeJHW7QUe+JaI40iKtNE1jWiqa7z7R65MXdy7+PZZ3bU6uiCMM/fUoGZMiCrUWx6c5/ULBqSQg7R85KcbsdIlfFMc/QZREmr/mM1dCnLZhDnimvGf7A8rridE3Zl7nti+ERs6zk6hStzszNbg5lytyWH36Qki+bl4jVGIK/lD5O7Igvt+B1B1DLLfqg6aFxbgql6sEfL5mDGO4+z0YP71xGe3dTPnlk918I1TIviPyiX21IoJAN62q2lqli2PtvLxMiNloxEiVqT9ZyxLYPw5V5F4o6Atwsc4uSTkUub5GpFshwryzTKPkj2ms480gQrwS0OXq9u2hn3lmiHeV/UsNdjSasLPI5YMRKnutBDNsQ/VDU8cMXJeMGFU4NbcbLHPWZk9hK4/F1vU2NKTbBNuO5PS9D/C8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c03cbb3-17d1-4412-1ed9-08d9df75771b 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:45.3788 (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 05/18] lavc/h264: replace MAX_DELAYED_PIC_COUNT with FF_ARRAY_ELEMS where appropriate 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gj15wEtXobjU From: Anton Khirnov --- libavcodec/h264_refs.c | 2 +- libavcodec/h264_slice.c | 2 +- libavcodec/h264dec.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 93526b11e2..94b473257f 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -729,7 +729,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) h->poc.frame_num = h->cur_pic_ptr->frame_num = 0; h->mmco_reset = 1; h->cur_pic_ptr->mmco_reset = 1; - for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++) + for (j = 0; j < FF_ARRAY_ELEMS(h->last_pocs); j++) h->last_pocs[j] = INT_MIN; break; default: av_assert0(0); diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 4833282191..d6d4497fc9 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -428,7 +428,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1); copy_picture_range(h->long_ref, h1->long_ref, 32, h, h1); copy_picture_range(h->delayed_pic, h1->delayed_pic, - MAX_DELAYED_PIC_COUNT + 2, h, h1); + FF_ARRAY_ELEMS(h->delayed_pic), h, h1); h->frame_recovered = h1->frame_recovered; diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 7f10026340..3706ae0e31 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -308,7 +308,7 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) h->sei.unregistered.x264_build = -1; h->next_outputed_poc = INT_MIN; - for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) + for (i = 0; i < FF_ARRAY_ELEMS(h->last_pocs); i++) h->last_pocs[i] = INT_MIN; ff_h264_sei_uninit(&h->sei); @@ -445,7 +445,7 @@ static void idr(H264Context *h) h->poc.prev_frame_num_offset = 0; h->poc.prev_poc_msb = 1<<16; h->poc.prev_poc_lsb = -1; - for (i = 0; i < MAX_DELAYED_PIC_COUNT; i++) + for (i = 0; i < FF_ARRAY_ELEMS(h->last_pocs); i++) h->last_pocs[i] = INT_MIN; } From patchwork Mon Jan 24 20:09:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15600iov; Mon, 24 Jan 2022 12:11:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZ0HFoaiM+EBBLvgySGAneJHwvp7+lN5oYuvbdGHCGB5HPg+fPW9xoQ5tUrvKTQEzcUZv/ X-Received: by 2002:a17:907:7247:: with SMTP id ds7mr14529769ejc.401.1643055065673; Mon, 24 Jan 2022 12:11:05 -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 ne27si6635629ejc.592.2022.01.24.12.11.05; Mon, 24 Jan 2022 12:11:05 -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=DBedkpqk; 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 09D9B68B1C6; Mon, 24 Jan 2022 22:10:09 +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 5D9BB68B192 for ; Mon, 24 Jan 2022 22:09:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kng0+VCGlTP0pOjcBrFWIDGJkL3bluvsa0OvR50FZ/Ins3Ldbqb/ZphpiuhLVETa2kdHzYR8D1zI4+I6nEKL+HIKA3a5ePiSMPNZdDUXB8kdoH7HpztEG02IeGTLQqbVsHKcTBQCLDi1GlVCSGHehGWAaNSHgGq1NqZMMR82uCC6qoABVYSIkFPJ493ocfpOQJWk4zApxj6bOKl0g4VY60MHgWg9ke/2LEjCW7Bo0XWbSAdxlf2zIaGMmRu63wxKeTPEWBLL6m2LLNPMRmjdCcq4NItFMBT+k36xttamSUbv1Fbwb0DivZ06gxXA2nDVMne5OthhqZobW9wbDCqe3Q== 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=Xl7SjLhRW3xVy+WwB7cMChvNm0Bt4cmMZwFrWIfeZg8=; b=bZ3PioYwVTBlYPnfCS4LqWpbsIIe6U5nq7jQEY+AAdnRfRIsS+jeFYw2IjRlhCfPS7pgCHsrJT8DTAwXK0PFoq9x4HMhMHu1ZIkztaVDhrzq5ZblU8kyUJqYX7L1xXEvsCbtMZcKrQ91MLFrtxFPvJod1UWbHz4Sbj3qHWFdKlcLV7Y3zXNemCyQTFr5Fzgt9h4bMrdWQv1y1HEyigARc9J+HT31HcMEKp5xJ3SGrDIJCC2ahNNEUVaFu4vPn/zLtxd+piTyM4Ndyyd7tkNezTYgMoa35HTLyn5kveQ3OVdAV3JQuQ8PeyJTE+gZ5lCzbh/XcVM3+0rt9AekgVXNig== 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=Xl7SjLhRW3xVy+WwB7cMChvNm0Bt4cmMZwFrWIfeZg8=; b=DBedkpqkHhaa9ahvj7uNrVg4l//ydTUQjWBhKQ8CPRtXPmLGU+dIdUJxG+Dy1BqMXL/hTJmb5tWNCOlTWSu3V9d7AAVtHbHuZ59NiwmCWi9Zl63rg8ey+2CVYbXyjtAVvPlfETBPPirhUXwHyKxuuhXsV5+jF/mRP0+YRjZm/2HpNRh4Gp8Jnf4jFO7jv778xxd2FW2s4VHSNULzZZwmZnPf3F5G10/pdjDru+MoT9MpcE+TTPlQ3n+yePehnZTf/DVCgeS5thVk51oJtSuTWV2fb7dZFWHdwq1xp0TMCoa9/MGJBNIGIRSfSFJaSoQTwGJtO489J7yojgEt3m95bw== 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:46 +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:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:19 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [czNLCoNmkWiqwnduNtgWUArsv4G+uMp2] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 30664d72-f778-418e-fdc4-08d9df7577f8 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qVJ4Fxp/fyKbJU3//KEGIcDThTyChvPk2X1NqXR8pFMnW+OOngojBsQjN+ucrkWBAGw9LPvVzkal9ucJ2oaN/rqsi/qsRooBUuKtbQypSM7nfi8c7su3H3pf8ysEMx/c+mBFdty021q+Kh9PLJLzP5vsaAkzOnj73vB8S9perf4nWYM/QnmA7ltLDBOdEpIKA1AATAEN8cusaDY2gjrEU2SLbO1pJtmget037MfiM/huzSDVEJWe1qXBmpPHbu3HUeMUVJp6lkcWNvKrjtZeeyEsw+ZfKxBDohW8Bo8K29nzt/MOvAGhdDQey4kjBZj72ZEad88lfopRuAKjri3nQdnTFiTdmuuYPsRHgmqBYYDz5QVYvWGKwBYzJkvWNN0xp5ZpEZ6osDWH3stVFBw82UxOXQswj9vT9Hz8wUsQbjV2JC9VK2tAPD/8CZzyAYHQOAq8Qv6hYpr2ylTyD5+qSBtCxt7uxrSFQkto0uUtBAzgKbEtYPQ7VrXLamZWnHj80XVDz88+4APWfwFBzS9fP3z+QADympSE0X/tu2EbImJmcVfl4m0AnTL0JP2UzmwBtHk1JrP8kAnxSCqzFhezHg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j8gmmq0mYyDL7zAMcB35epUkxPKCSKGQsmfOPvJOAKT8x/hAckp3G0XeJ2Pgijyk/wchSICtti2wGeic8wUNkgFuqvHdkmBO4Q+UpO9X+dfBRolB1u1Ki/kx0CYdpIUgzg8uhjZMB/EbJskZAHTHlyYxaqKZ1i+CkB6e7F7y64NgSMiIx1hz++QmjaoX2fr4m6W5AnHv6qf9hSfgiuBfvvq3RWQYWM50cVV2YN0A0h6vlNHfqhLOvg/55Gx2PfVomYmqeyIvbviCBozvIK/WlnyzKQgI6U2OY+oND7fDE7hrXHQqpvWXVJmudmd65tQdpuAoJbJAFMGHdSO9GSeyZue88deGKpRpI37CuTIzYqmH4D6QSSFi0PsZXFCfKaO9eEGtYXjXWiCTawKDEKbkFpuAVEOzs3SQ6+tN36DMSQjdBCECJVXD9cCasDPWr/wkUTgSdOMCQdZgas7+ZRRrZzE2w6mR6UwRdKorvDFlUqDGZa83/TD1EfekyfO81w1fs1UbPth4H56fHx4PmisGo6MrQF0oIB6o65N8H85xCd1mLmlDMr2PCZjjVkgd93+bTRyIb+I6e/Gi0JVB1NFK4rnIwT2FWQklkCS8yrCPDiOu6Q01Py9GaZHpaZl2yrBS8eK+lAF2mmUWnXqGRRFf3xz4nrsy3c4tXwZsJzMkWH99skj/yngSHwM5VH7B0aFhpAtUMAkqdfZ5EMVjMeRzeFt1G6r0DnpfDosIrGsPvRfoRFI0V7afMJiKE6ClONLLZ02qW8XjhNuBqo9QSgx1/QMPsEjgJQ+CMErCs5sZso7a0W99u5i75WDTuNyZo+czsMVrwAyNhIfafmfI776VwcKd2lm/Y8ydS/f8hW4ZdVeHg9BCCNLUp19nVL4P2KX76W3TYdlrMoUAa4YL56eF+Thrtg0BPZdy2LqJTGlIfPq6NYq1emgq58MtVt+MrEvwbEQtNmycx8RGpohb7WvjKQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30664d72-f778-418e-fdc4-08d9df7577f8 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:46.8328 (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 06/18] lavc/h264: replace MAX_DELAYED_PIC_COUNT by H264_MAX_DPB_FRAMES 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qHZrzcY/xUif From: Anton Khirnov --- libavcodec/h264_ps.c | 4 ++-- libavcodec/h264_slice.c | 12 ++++++------ libavcodec/h264dec.h | 6 ++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index e21c2b56ac..f68d5bf81c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -485,7 +485,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, sps->ref_frame_count = get_ue_golomb_31(gb); if (avctx->codec_tag == MKTAG('S', 'M', 'V', '2')) sps->ref_frame_count = FFMAX(2, sps->ref_frame_count); - if (sps->ref_frame_count > MAX_DELAYED_PIC_COUNT) { + if (sps->ref_frame_count > H264_MAX_DPB_FRAMES) { av_log(avctx, AV_LOG_ERROR, "too many reference frames %d\n", sps->ref_frame_count); goto fail; @@ -590,7 +590,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, * level */ if (!sps->bitstream_restriction_flag && (sps->ref_frame_count || avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT)) { - sps->num_reorder_frames = MAX_DELAYED_PIC_COUNT - 1; + sps->num_reorder_frames = H264_MAX_DPB_FRAMES - 1; for (i = 0; i < FF_ARRAY_ELEMS(level_max_dpb_mbs); i++) { if (level_max_dpb_mbs[i][0] == sps->level_idc) { sps->num_reorder_frames = FFMIN(level_max_dpb_mbs[i][1] / (sps->mb_width * sps->mb_height), diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index d6d4497fc9..32df9fd3ae 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1456,7 +1456,7 @@ static int h264_select_output_frame(H264Context *h) } for (i = 0; 1; i++) { - if(i == MAX_DELAYED_PIC_COUNT || cur->poc < h->last_pocs[i]){ + if(i == H264_MAX_DPB_FRAMES || cur->poc < h->last_pocs[i]){ if(i) h->last_pocs[i-1] = cur->poc; break; @@ -1464,13 +1464,13 @@ static int h264_select_output_frame(H264Context *h) h->last_pocs[i-1]= h->last_pocs[i]; } } - out_of_order = MAX_DELAYED_PIC_COUNT - i; + out_of_order = H264_MAX_DPB_FRAMES - i; if( cur->f->pict_type == AV_PICTURE_TYPE_B - || (h->last_pocs[MAX_DELAYED_PIC_COUNT-2] > INT_MIN && h->last_pocs[MAX_DELAYED_PIC_COUNT-1] - (int64_t)h->last_pocs[MAX_DELAYED_PIC_COUNT-2] > 2)) + || (h->last_pocs[H264_MAX_DPB_FRAMES-2] > INT_MIN && h->last_pocs[H264_MAX_DPB_FRAMES-1] - (int64_t)h->last_pocs[H264_MAX_DPB_FRAMES-2] > 2)) out_of_order = FFMAX(out_of_order, 1); - if (out_of_order == MAX_DELAYED_PIC_COUNT) { + if (out_of_order == H264_MAX_DPB_FRAMES) { av_log(h->avctx, AV_LOG_VERBOSE, "Invalid POC %d<%d\n", cur->poc, h->last_pocs[0]); - for (i = 1; i < MAX_DELAYED_PIC_COUNT; i++) + for (i = 1; i < H264_MAX_DPB_FRAMES; i++) h->last_pocs[i] = INT_MIN; h->last_pocs[0] = cur->poc; cur->mmco_reset = 1; @@ -1484,7 +1484,7 @@ static int h264_select_output_frame(H264Context *h) while (h->delayed_pic[pics]) pics++; - av_assert0(pics <= MAX_DELAYED_PIC_COUNT); + av_assert0(pics <= H264_MAX_DPB_FRAMES); h->delayed_pic[pics++] = cur; if (cur->reference == 0) diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index c7662f930e..7553dd808c 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -52,8 +52,6 @@ #define H264_MAX_PICTURE_COUNT 36 -#define MAX_DELAYED_PIC_COUNT 16 - /* Compiling in interlaced support reduces the speed * of progressive decoding by about 2%. */ #define ALLOW_INTERLACE @@ -465,8 +463,8 @@ typedef struct H264Context { H264Ref default_ref[2]; H264Picture *short_ref[32]; H264Picture *long_ref[32]; - H264Picture *delayed_pic[MAX_DELAYED_PIC_COUNT + 2]; // FIXME size? - int last_pocs[MAX_DELAYED_PIC_COUNT]; + H264Picture *delayed_pic[H264_MAX_DPB_FRAMES + 2]; // FIXME size? + int last_pocs[H264_MAX_DPB_FRAMES]; H264Picture *next_output_pic; int next_outputed_poc; int poc_offset; ///< PicOrderCnt_offset from SMPTE RDD-2006 From patchwork Mon Jan 24 20:09:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15242iov; Mon, 24 Jan 2022 12:10:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxO0AUrWZbPq4PqKQeI+mJ/fNp/PO5ko/VsjYVFk6P6K0qFJFN8yJl4cxmhd+P01yMlVoJM X-Received: by 2002:a17:906:150c:: with SMTP id b12mr13298612ejd.284.1643055034376; Mon, 24 Jan 2022 12:10:34 -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 e10si8907414edj.463.2022.01.24.12.10.33; Mon, 24 Jan 2022 12:10:34 -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=dsVKcTNR; 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 3EE6368B174; Mon, 24 Jan 2022 22:10:04 +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-oln040092065021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A3F968B159 for ; Mon, 24 Jan 2022 22:10:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AemAujfY/O3C0A4kP3+vnrA3wyxhapsf7pp/4jpX0lx4qnXA6JAqF+o7CImA9cROlnow7k6x0FihNfniUmYdnNTJDqsZwe10Bpt5/g8qQVx4KQbV3J4x4yjqiOZgJRkrZi4UczJ9h0xIin4VbZZXcv2Y+oXRTuKjH7a5NRkvCKG7M6To1n+SBoX/aaxYk/jLnuppyGZyM8FX6VceGuYMAAvNZfhwDMhV4n45Kv53zLweV6kkeqhYeiW25fAVIcYymwxK1LeZ405pGgmXMBUqJZjMTCLtn4FGedhulzNWeaj45yIW9j6kgibgnzEAZW+DceGRxeSI1CkhSsE9GQ8Dpw== 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=6qZLcweDZWSHWs8EroUcSg34TlC6e4plFKFNJO9/mfQ=; b=U1lfTP+AVLAL7mTxn4zdp1BO7i86k0YXTbvM1J0DfNung7mTLBTlXOwB1hbjtlybIN3FPc7CQxnWvHSWgYtJNx5nzYv5XOHStW9VbDJRPZCet+NatFW1rt4Kocs1hdySALdxdIN/W4QBCgdUzUKK7+f0bmG6vE0Zx0sdUztqM265Z96liexOOChgkm8qOVe3xAC6MClRNAG0+Oxpz9EMvZdVwjc6iQxpb0f84iE0Zye19N2NgiBqKpcMwDmfTCklAnztgSuk8RdH1U0TFDXYGZBOR9NiKzm9jUFzYd3EYX+Z0OK82hDJneCaDHm9+GSJj0a0PgeAINgaYWOuqaQN5g== 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=6qZLcweDZWSHWs8EroUcSg34TlC6e4plFKFNJO9/mfQ=; b=dsVKcTNR2sq82YRNu7pT09hijVAWGdsXymeUQ96F2WOxmvWnCImJGEGU6W/Vn7uoi7uc+Qo/vH00wDIxX5ynGs8gFHhndr4PF4V/7fy1rJrq97F8OhHykM6+I9JoZ61S0VjpOMjisJ/zghNNIeEUwXAmAi5ZrQiCf4jjETYp+vHtO1FwAYr7KHIBOMP3ixeRMj1KX/2UhWqbSDPXsCLujSIn7U4PJCpi6I6Mmqlae7RWaeNZS/iGWQNEPculoM4r+H4xlhhLK3rzY7rOOie1W5IYVoy+heRexNebPX4C8yAzxz7hseKUjpN/ZgNpfzwO+nOnRRb3TzPEdoEEmOyinQ== 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:48 +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:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:20 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [rYqBI9VHoQ2Z6cg+PlKMEl2PkJD7SDsG] 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-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87df9052-606d-4f77-50da-08d9df757912 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /3j+NaDb1GRWBIrfH9p2TCSDXxRexiWNSmxmEPZEsTQ64fjHtBFhuWalTOuoCvwG9n5NP9q4kKwauVDTYeVxNSdmxBNi+4/aIv/sED5gqY9JLMMk6iQ1unw6LKJma2wIpzV6pHh8T8joJhQXM7i8D3dC8XAPtOMvFZ5JbtzChh3JLXctP5UW9SlCLHaexbDI0h8cMtJoOiuH3mbKLTLTfn1yqKrnef0jXrx0hOb7RJdHyJeHUUnoXbM48CsMFQkaSg68SJu1onPMKRrvBU6hvwZuWmGi0liFJ1kgroiegVZ5BmQaAmEUdFqsP07BIOPUu8wxyRmJumJJuuSsGuJAeohis+YL4R8p6fLZWp58IeuodYBYqKS4kQrQCt6XVLLGoMWd/kZ16Bm26xsI0Im2JlezUmaYJP56ZpyKtFH10iiwrSQ15IYbqvqwnzeLYDjJe5ru1dHWGqB+SEjkRQki0+18mYZK98Gs+JRhao87GJVy4m3LsyINAPfI9Zbfvo4TtnkH8yW0JNsr+YHLWas3/84NqlDyWpPBbSfT4f6SPwINuWmYI3I83rbh7GGLF2eIO23P0z1SUwZiMbboWj5DYg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YY7Q51K9PBZTnnz8hWN6/xpROUdzDhUfX2Pdxo5F2nvZBN+pBfNtHNLTH0y4qUTukEOoIZncsS3AMpd8YS9vNBKHG0Y4Fo1XnijT85suuxfq1bz+lcBNvMqA//E7g0le+Zg0mUANA9y6DoyRkruroZDjvPh/1ORfzVCk+32gVSvqetBRsw/Wst/D3U7jrMCmgCSdLkdjqvEqyBEoWpXQJQPleW/sYQv4yUjLTxjsAMgrKD6dbKJ1I1gdNhgt7tkzas7qJaJCawzGovHSvZrOG+/aGp5CbQTpVC84Vib0RjYnrhROVUwmAz+xWMY7vLG+GCSBCQdyiR+54d7HshyyjNbRD6c/vT40+Aq9p/dYgGqQbNM/81YzjHiUGI9fqiufRHr2EnEtDQ/WVugMr8QU68duPti9k0uWbdvgtLpvGftuGxak76rJU1rAAhgP3oNtWH3UeuPvITDYpUdqyMscksi2fIE9xFRGlFsTTZUfWLGENwOZsBwmmWOWHbpqK+dF8l5+nykGRW3muwmDnAwFN6GirNQKbsl++z+7cW7tw9uhRjlH8EBU0ssifcnBuIhWRQYu9kDBpruxas6o5/csd59WjOfTg8CqVBA/eMM/98XJNVD4WBhp2C75HlpKYhnuD8nIlCWYdYmcdwByuA1WKmMQqyRFiQS4UWhX9zUfYSo6wTVKBn/VIrAch+HZx9S4hlSfIauHc2KJZKeaDbr5N1D0OTMDm3+BmEw2g7r1T4R2+/ioXri5/loskYWlXMoZUoeAoOeCN6Bn056L8uCegD4fXq60llhdU6zElDli+dFiZcoffaZJ2z6UqynJYB4BQ7Cq2Ql8wGV43+oT9zzO6/y37hhak78rsYgaWNV7zEjTNJ+nBpsHdCPHbrGWfHSogh8i1BuWXbPgEcQuQiro+dSbH87YYn12/49c2iJZ0xoRKeT4dWFoT5OoAjsootnqit8CAwYPHPDC/1uqG3gOqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87df9052-606d-4f77-50da-08d9df757912 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:48.7234 (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 07/18] lavc/h264_parser: add missing headers 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GU7zrobfPexJ From: Anton Khirnov --- libavcodec/h264_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index aee7cdb934..4002bcad77 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -40,8 +40,11 @@ #include "get_bits.h" #include "golomb.h" #include "h264.h" +#include "h264dsp.h" +#include "h264_parse.h" #include "h264_sei.h" #include "h264_ps.h" +#include "h2645_parse.h" #include "h264data.h" #include "internal.h" #include "mpegutils.h" From patchwork Mon Jan 24 20:09:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15362iov; Mon, 24 Jan 2022 12:10:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwn5q2HNZmWrmuQXx2HYxLST0ML/dl16USZPVSTByr9znCWo3vWyobAQRyVzroZKpBcETzq X-Received: by 2002:a17:906:f85:: with SMTP id q5mr14347443ejj.232.1643055044428; Mon, 24 Jan 2022 12:10:44 -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 o8si1065296ejy.37.2022.01.24.12.10.44; Mon, 24 Jan 2022 12:10:44 -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=U1P3FK6O; 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 19CB768B1A8; Mon, 24 Jan 2022 22:10:05 +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-oln040092065021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9664368B15C for ; Mon, 24 Jan 2022 22:10:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CNPj1Zl3Q5n1tLjO81t43CFSVasg7+7rCCjU0+auPFvKKFgtCdNzT5PN0U5K5tM3KAf3IphG6K4pooy89cc/kmf50SkmcPv+wpzWbMndl62J9xgfH2rL8zZV5tOb9QXCVFnAZN5K03ZL4bSja/vvT5+RZA25OS88g2bAadH5QiSxde4yChewKqeV4wERZTljTgngHuwFtpohjc6Vfvmxj80Pgv0hPq51aEJy+xWnL5HJTls/9LCAgpk3uzwU04VLDrskRt+nHsD+A5BWkrWpRYDyRqWNUVVR/bM0Wcpr4g+WHsMx1JcyUESOTajd8PG/PaPTBEs1QKK1+PuSwAtf8Q== 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=MiEB1IEnoO1x/gDBB6fFSFjihnm47KtzcYo/DVQUaaw=; b=OCYCGyeLu1J3/hslINEr04pETe3HhPvR32Dj6UQzo2veaR4kVeEyPzFIIgJaX4R6SbzUpCXoMfgEm6XoIgoGRt7kfAuWTAvIgav8hdbe4Ov2onT5qwx4592XHfn9II7Ort57hYZLdnJJ5yi71lIcZs8d/qo0rbxLGVDYJvBFaURp1J52gTCMY3JGmz1gKQG/yyhI8PSzNFCKgqN40kKv11hI1QpwdbGiVv6e3sDXEo1G8TbVz92T4qA2FI8AfUzv/wg42oorSQn81xHYSDBl2TxYGnVKxq9zqZsjYSd5/SOPqvmKKQ7SR8ic2N6kFFBJWPUNGK5+QtifoFHaVVQ2HA== 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=MiEB1IEnoO1x/gDBB6fFSFjihnm47KtzcYo/DVQUaaw=; b=U1P3FK6OgP7wHKimHdeIIuk5cJX3TlUNAmm+tI9tJ1WPDt5/wGlYcCkRbar/xj/vUUAfwYoOnGN3Phajlj/qgnVsnnlNDFgy1SYBjPFuZXKDCmK5Co0QoBHiuVX47b7gHpxB3QcSmlCEB/GFlP4xNsgL3JDfU0lcNhH6qcGJfX4w8B8lIgmW7Ehf8UOwuQ3M61iO0v68Q8OftTsKo5VSFnsJQVgH8fzoEFt8nxaFlMRHHbBt7AsfZwd+K/a1v1+DvAb5luBXrS4xh+69qlajlycr89pKKH114FIPSE0b/hl3FBaGUXN2i2Kk6elpDV3CTG5wCWOQD8Y5THgbwmSm6Q== 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:53 +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:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:21 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [EeqELdoeyLxTWJVAv+Omqc+ANQ5yH0p5] 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-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b19d7d1-1fc6-4f6b-7261-08d9df757bb4 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hJx4OfYP7Gx5LPGhR2ar8rzAKIwr61SvkCq6Gl2kVScvH3IeLn0ZrPkm8rwVCZBu/+iIGBRUSX1q/3WxRq285WLTB4yaxNqU7/LlUblPGzo2xZ9fxvPdNZuvkOKk8dErI56snHJhBvCqk643B+kpfVm8xTJrf+rOE7bQnZfuO4/33AHGCa9OFdJ/p+PYmiigxOdaYVlnumyQOiRsKavAs6e1aE3uEO2lUHSu3lS1i0/7yTMBWYXnOQDEJfIziKd9WI6Fzbgr1klBrBEikG2+RotXW202saMg34QLhlmep49EyuhBDLZRw62k4adQzG4fxh26hGWwbfJgbQNRY8JGdBjB8vovEjaMNMaBu3j6X6XLrJF5+J5+HRTbbjzqHrharJinToZSHuneyCqXaWsgndAlbX/NEjrnY9BN2FK6diQZrGX4klvIeMB9Csr25EacvCGR1wi1r2dSKevssSF1PW4b1SieGwyzovq6KbnkQMGAncpRFsKNHCtoPHp20puU4kATx46/atsZ6YvHV5AF/vp4htNPKv6IkkkVt3qYgsRN9tKtXBFtNnII4PzwJDgDfVJ6GNTRQouMEes6Y5AJXQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yoZW7sycQuwGf00RMtULTp5M1PP8ByTNdCwY1M5RC+wsQXlNiqzhDbECRGB0xDQt1uuDfBXs4M+mFvtiZpm5t7e2b8tZK3T/R4qjRzaKl0QK8A3FCOL1XQ9bwYur8KpkbbeSB/AcIsth4nDDLCHqyMmJVo1GCQaUs61vSyRxnGtT5MuuI4BjyF/7F/BX7cxeq291Py8LTlIit2GYiDmz4mQK5I0eWTamjrhJte7mlRSHj7SrOLObjQqG0gpQySyBf5/qgwRBhzChyizcgn2nUOvQaGkVdOt+XZKvWelkkNdm9ySrDDAWfovpXZgHmAFk7qlrJ/j6zAm3AXggTdub3m4B3+Yi39NhCyiBzisX8hrWo2j1fXA4kKgT5TAvRcqDimsBx+LnW4OqDMVoMeUPRC+IB0HdfJFjDYFlWYHPNLoMI4E4Mn9SoUrsL+8xLj5RiMaRhUy4Z8cS2JXS7hX4LztVoiUShSrMXaEOMoyUmG5hMWVLzLo870HYBTJd7oxoqFZ7tG5Gi1nCivBgoQyk6sW/b/Ev8nyEUgRpgZpOTEOGq52NkVjVdV59q+EzZoF9R2BqY4tjmq5rEfu+/rARwhpvE+akQUBl5jga3t51xv4CGCKs4RMRzQWYTntODRkDlBbUXLSuWTWFuT/6GhtdlKwnvFxZN72mcM8UsB5J5Kht/12thvtEYEeuOgsCMt5gJ1IttLH6A9NxirndFywW/CMFa6koy7DydUkxL5Nr9DmVrppwBMEPzEOCKo2lnZrxm07Gc229ThHhC29ifvbWWq6ByuTugxoJBVbpQh1IjsU+OesMqoMysjqeaosywXhpQSLf7E1Oy+hK3jFs03QKTQMwX6AYrJJEpdHBxW8IT22jdAI0JqJCjZWJTVPgkzipTKD1S0ArTHpDN9UuSrEXBu+FVKPiMRg2vIo7qeCBKGtDnGz+G3ylEBs52tZU8ZpOOzaQXBqvs14kYUeV/7Wi5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b19d7d1-1fc6-4f6b-7261-08d9df757bb4 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:53.0936 (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 08/18] lavc/h264: move some shared code from h264dec to h264_parse 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6pnjUYENigI/ From: Anton Khirnov --- libavcodec/h264_parse.h | 32 ++++++++++++++++++++++++++++++++ libavcodec/h264dec.h | 26 -------------------------- tests/checkasm/h264dsp.c | 1 + 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 05732326d3..52b224f4c5 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -24,9 +24,32 @@ #ifndef AVCODEC_H264_PARSE_H #define AVCODEC_H264_PARSE_H +#include "config.h" + +#include + +#include "libavutil/attributes.h" + #include "get_bits.h" #include "h264_ps.h" +// This table must be here because scan8[constant] must be known at compiletime +static const uint8_t scan8[16 * 3 + 3] = { + 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8, + 6 + 1 * 8, 7 + 1 * 8, 6 + 2 * 8, 7 + 2 * 8, + 4 + 3 * 8, 5 + 3 * 8, 4 + 4 * 8, 5 + 4 * 8, + 6 + 3 * 8, 7 + 3 * 8, 6 + 4 * 8, 7 + 4 * 8, + 4 + 6 * 8, 5 + 6 * 8, 4 + 7 * 8, 5 + 7 * 8, + 6 + 6 * 8, 7 + 6 * 8, 6 + 7 * 8, 7 + 7 * 8, + 4 + 8 * 8, 5 + 8 * 8, 4 + 9 * 8, 5 + 9 * 8, + 6 + 8 * 8, 7 + 8 * 8, 6 + 9 * 8, 7 + 9 * 8, + 4 + 11 * 8, 5 + 11 * 8, 4 + 12 * 8, 5 + 12 * 8, + 6 + 11 * 8, 7 + 11 * 8, 6 + 12 * 8, 7 + 12 * 8, + 4 + 13 * 8, 5 + 13 * 8, 4 + 14 * 8, 5 + 14 * 8, + 6 + 13 * 8, 7 + 13 * 8, 6 + 14 * 8, 7 + 14 * 8, + 0 + 0 * 8, 0 + 5 * 8, 0 + 10 * 8 +}; + /** * Memory management control operation opcode. */ @@ -103,4 +126,13 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, */ int ff_h264_get_profile(const SPS *sps); +static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) +{ +#if HAVE_BIGENDIAN + return (b & 0xFFFF) + (a << 16); +#else + return (a & 0xFFFF) + (b << 16); +#endif +} + #endif /* AVCODEC_H264_PARSE_H */ diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 7553dd808c..5266420fa1 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -642,32 +642,6 @@ void ff_h264_filter_mb(const H264Context *h, H264SliceContext *sl, int mb_x, int #define LUMA_DC_BLOCK_INDEX 48 #define CHROMA_DC_BLOCK_INDEX 49 -// This table must be here because scan8[constant] must be known at compiletime -static const uint8_t scan8[16 * 3 + 3] = { - 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8, - 6 + 1 * 8, 7 + 1 * 8, 6 + 2 * 8, 7 + 2 * 8, - 4 + 3 * 8, 5 + 3 * 8, 4 + 4 * 8, 5 + 4 * 8, - 6 + 3 * 8, 7 + 3 * 8, 6 + 4 * 8, 7 + 4 * 8, - 4 + 6 * 8, 5 + 6 * 8, 4 + 7 * 8, 5 + 7 * 8, - 6 + 6 * 8, 7 + 6 * 8, 6 + 7 * 8, 7 + 7 * 8, - 4 + 8 * 8, 5 + 8 * 8, 4 + 9 * 8, 5 + 9 * 8, - 6 + 8 * 8, 7 + 8 * 8, 6 + 9 * 8, 7 + 9 * 8, - 4 + 11 * 8, 5 + 11 * 8, 4 + 12 * 8, 5 + 12 * 8, - 6 + 11 * 8, 7 + 11 * 8, 6 + 12 * 8, 7 + 12 * 8, - 4 + 13 * 8, 5 + 13 * 8, 4 + 14 * 8, 5 + 14 * 8, - 6 + 13 * 8, 7 + 13 * 8, 6 + 14 * 8, 7 + 14 * 8, - 0 + 0 * 8, 0 + 5 * 8, 0 + 10 * 8 -}; - -static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) -{ -#if HAVE_BIGENDIAN - return (b & 0xFFFF) + (a << 16); -#else - return (a & 0xFFFF) + (b << 16); -#endif -} - /** * Get the chroma qp. */ diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c index 7392452957..3c95f9d74d 100644 --- a/tests/checkasm/h264dsp.c +++ b/tests/checkasm/h264dsp.c @@ -23,6 +23,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/h264dsp.h" #include "libavcodec/h264data.h" +#include "libavcodec/h264_parse.h" #include "libavutil/common.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" From patchwork Mon Jan 24 20:09: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: 33821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15477iov; Mon, 24 Jan 2022 12:10:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxecT+FVD9uYuSVllisMf0rNwv+er81MpndfzhH+vk0XdggUPiR8KGyXgSv4d3oigTlh95t X-Received: by 2002:a17:907:9690:: with SMTP id hd16mr7742663ejc.4.1643055055349; Mon, 24 Jan 2022 12:10:55 -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 d17si8929897edj.467.2022.01.24.12.10.54; Mon, 24 Jan 2022 12:10:55 -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=fWrL5Tpy; 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 0F74768B17F; Mon, 24 Jan 2022 22:10:06 +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-oln040092065021.outbound.protection.outlook.com [40.92.65.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C317468B168 for ; Mon, 24 Jan 2022 22:10:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cBFLsbrUpB4wb2/cqIV0ceIk0FZp4YRIA5vjlDSqWXt2juT8K+WQ/4W6LiZgjHt92xWgjW7ANYz4okgnEGjGxQMtmZPaiAC4j4png0WiOgIuulYZ7GMqB2wQCUXQdejCk9x/zJ18t8vMr+zZkkYfHSqOREbiuW5/ZckTnns8j/V1x05s2jJyibV38OgIsNXNbdlL26RRkNLJw45L0RbtoqKWlkjGvZhBOmOLZSNBavlUzu8mFscTBN6DzATRGtDu0NMPr5OBY9Nl3lTcRitOhH0HJJ6ZRLTQZ6yrDvyZq7OR2j1YZZDOrzju1hhBTke38YLNlsjJRaD3mTJbK3DQzg== 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=bwz6yUjf8EemJxjJU4REpfTIhOM3Y2mQeBE9yDa/sfA=; b=O+HGvUdSuVpnPYzjUdkz23TtXVfWmMWmUcZFHdblPyQTwrPFOZ5z2XoJ346gVeTwlRZmI/Rcmxa9+sCNPtJGmfOZikSKMxtKqlp74v+4GnmJK9984HTT2HRl3VLI0vEB1nKrSQBhW0zMCvbKS5+KHLYxUxfXOOBY01csRVXPZQsBK28T97lKQSu6RUtgClKfO//vTo/I4LoSuPBosmu9bpEZTHhvrAXClrKhc9iWfi4uBH5mQ5J2bd5TLJlcO435zrQjKDNANiBVKQgqxk5+lieNZ+UpoO3C1BcatKgEfUsrGVUtC3qL0q5e3AktkTlTcBSrIYdQyytVb4VkoQUSmw== 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=bwz6yUjf8EemJxjJU4REpfTIhOM3Y2mQeBE9yDa/sfA=; b=fWrL5TpyyK2qWe75afkF9e4aL1+Y3S/z51YV0nq4W+f80kPyEYRux0p6q52S3a3LdUAr8bL8MNgEs9UA6jelLm4o4iH8RBBctApykEzX7qY53mamwt5ec4AtDZf+UEMjcvqqT4Cq6XFtGzAslFTMAXcX+J3WnsRCgrVroxgbSpmklEeyuipTCVgC/PtZAFnZkas8uGOn9kI4FEsU66xenjRRSmKpZQYQ9pJS7wY0ZCe4U7dqJSR0gSJgra3O4ThnotnRRD8BkhBOM5N6C0OQnBbOat/dEPdWTNML8y/vGWSZ1pVaPrANoR6Lm67O13Hc5enmO2Abwr+RVNChbGrlvQ== 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:54 +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:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:22 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [4B9rBl8bD/GOx94tg/Nvl4FdT1WEZaRQ] 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-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b7e854f-193f-44aa-48f2-08d9df757c67 X-MS-TrafficTypeDiagnostic: VI1PR0301MB2557:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FYQFXpbswzEIP3G1PW5esUfoR5zw8FUS0UpUfj++od6IW9jHx0j8+nFbIp4U2hMmfFlNeV/htRm7850fp40VgrGG/qYaj5zzSQbR0YM8EiETL36eb69xBYl4G2ARdF/2WxWtULDACYpFzxN22YYC/La2VXnyHwce/3ds6Z8euF/+eTEyZ9cgqzBsh9ag1iLhLtnVF0STS7nvWIxu1V39RahC2na6gIINEDrGzpQCMA+3+tLC2VKvcvnu18m/btzrXJQW5bqsp500s60FdJmA5dm1t4z1dpUl7ahxG3kg2ul61s/JoJsH4Lx8tu16z7LmTpB16oIJABXjkVpskUw34MQOWmbE43YcqveotaobM7suM87c9UQZ7PPMizHxBIzH5T8/3kvim7GnDwUrtNybtR8j7atLmnDznyiMVNCHqN6fn/kvYaDpw6rS3+LQErPaO9bFnKYRjlZO85RRjbeXOj//eacj0URJP4iWImqweGczCw4GL7s/7iRlj4c9zw/wnQ2ypjLSwhZ+t4bJJLbxLdj0BRte4DiLZyUq6F9lCBePgn5uwoHIxfnJuTn9yg4M3Kutp1RrTUJgxYlxCvdEmg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g+fms4oHeE9B0VRhd7s7TBdkniDn/INyzM5qQAALlJG+LHWMgtO5iXE4t+1miYr2D71fmPhXveVo8vh3SerHndyDXmKY4zIsUtW1Kmo61Qg38RC02X3FP7huSoiCh20n2Urm1V6mvAjIXiXucgZ8rxc4Mg6HRiJMg2gxcmMLaXaigtMEq1+gSmU0+E0HjvEXIw+yQnrgntRkgn0FILKTfihB1Ebjmi9R2j9e5iC8lh45D9wa5tKWOptO/mqUmfuJyRdBUAwIiixsVRLr619KWDq62LnezIbb7GYoHv9v7Rcd2GdkIjH6GrHC02v80wsx1AHSy1NvtBPjpzQzhTfeuWlJdDxycr9nC/991yizIyklE5CNdqJMEXTcfYtg9UiC1WNFuaWbJ7zZHHk0+9kh8Em28R4T6sLIbVqEh66UGgvS+KFCgFtnGLRZJegW5IMXPUrxgXbgsitGnPxqsxMxgDeh4MgO8DynKuWt0z0yBdTgY3Ta65U/CWx3ZLsnWZ4R96x/BnrzLuTLPL/wP/2YLYwPvB6e4ZbDyo6bTMSEa429u+Oa4MgkvvJQy2RI9SKxjpkUeU6S46sgVWQQSUax0tUrVewt7yeoFBjE54pT9UBEYdz+vMobrlZN37Y19OyGfBqoi+yRSoN3AtEcl9DVfRd0K+7D242gtfvedBj0r9vjjoVrrFi9cCirmZm1zXeuSMH1OEAm5GcfBwLMIsYiUJ2UHtnjRj039TAetowhhp2GbzNxzinnEa/thJr6XZd7mLgxq5DQwdu9bLeMlLYwAf99P3LtyQuXisf+TurG20mEWK/iHx9+Scogc2Y0d2ZYCELVfoDf6K7siqJjS8eJqvb+2hPtHw2c1YP/p4tObKir/bGaeOtE9ht/Xk3MAk4c43YTUrGeiM0Ve6SnokleQfb4FRqW3tMHl3KvFCyDU7eVg1cA9W12ZWZMgHVeeMWpBRAi22/zP7QHEgFPsb3XEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b7e854f-193f-44aa-48f2-08d9df757c67 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:54.2821 (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 09/18] lavc/h264data.h: stop including h264dec.h 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wTYRlE2rqnwF From: Anton Khirnov This header does not need anything from there. --- libavcodec/h264data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 2968b08b7e..988352aa9a 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -21,7 +21,7 @@ #include -#include "h264dec.h" +#include "h264.h" extern const uint8_t ff_h264_golomb_to_pict_type[5]; extern const uint8_t ff_h264_golomb_to_intra4x4_cbp[48]; From patchwork Mon Jan 24 20:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33823 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15694iov; Mon, 24 Jan 2022 12:11:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXLCSkF/YnkehqSZpNHGcASL2vil0kmhh4zZ+dQAcUe/xO31z+e6ix5TQE3rfwn0dTRnCj X-Received: by 2002:a17:906:4fcc:: with SMTP id i12mr1487382ejw.530.1643055076496; Mon, 24 Jan 2022 12:11:16 -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 m17si9973534edd.153.2022.01.24.12.11.16; Mon, 24 Jan 2022 12:11:16 -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=uwisaieE; 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 1DC6468B1CE; Mon, 24 Jan 2022 22:10:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24D3268B176 for ; Mon, 24 Jan 2022 22:10:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jB0bdhp6+KcREnFTvtl/ZNm+pChXXrpVnMbJJboAko8y3QGR67OHPfVgcz4wG6sJvh9UZW0gkvNNfLjnk717whfjJtWgVbdpojdDsHZ9psSOf7/toXXMIyGNJGj/CoBxmzXceGoGL6faUBbxrAaLl+yrzoGEYiKzFFWXsr3BWHuwdEXUqrNM1dVY/Q+DIoJlpnUdXElGyj5zpAd9D5NhbQz952yhUqWNY/Kkj4m4hm3EgtxSTsq84FW3dTGY6aOEhVRZvV1uBTTUnKtQ4y5NBWarUk7T2XT5KuJpDWmkYKBMPRYzomfDfc8PGdVDzF6bvN335a5vHeHEanZ3oqck/g== 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=iwVqcopzta+MBufmVE2wfrli50EY/KHMpF7a+g/Y6ZQ=; b=RyiVos+YWswGwyNw7KJnj+i8vokvrRFx4xTTyOwR9KatskkPCiKe4sQmXWbqvZdtN4GG1zOEy/0iZAt6ditBFLZTjgBrjxBgoRkOS3QNaiJLjwLnfWPJ/HRZrBMuaAnlUoRpKq6Cnzm5zzn/i7Iz5vN9/2uqHranRbTZwGYaISuwxNClaULsoy3K2exud4/IeKVElQqjVBjmS131y/etJhG2PoGeOtEbW0HFPy+LCY5EcGcLhh4jA/39//XqfgXmZuGsprMfGZrUJpuOzbWjIV6ZvPWA8YiJx5SmMRZV1cZoSdgMVAlDP/lMhQ3lsJARFs90Zr6Upqh1j907o0ALTA== 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=iwVqcopzta+MBufmVE2wfrli50EY/KHMpF7a+g/Y6ZQ=; b=uwisaieENMl2/QZ1mNCqzbG4E9aDSuW/FjGgGehDWF7pP6GHs7EXcQqGa5RYP8t+gyLLHDzo75X/2PaJqAwvkwhmvMmy9TkWsoppKG9CQ4cKkUtg8uRujT/By6Y1H4WO2T4AkfYGyOE1br5eB7s+KcwH8HnoUUatodJVBjFZesI2IIXryQynHnNKWj8c5UW0iYjmntSGtodEoq3ouIDkGMXEcyp8Q6zNizgiqD2GXPhCCRet14Z0hjw1sIpU4zw9Cg418BWfhXUzqfvad6QDlg9I+EjDZYUulEIgQ4yk5cLkzBKSp3QjLE4noD3H4FJd0mkoERETIEL4LZZq3TEuKw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:58 +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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:23 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [poyFz3sIxtGtZEDtEZp6gJI6hg3vDGUd] 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-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 106277cb-4657-404c-d8f9-08d9df757f0e X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6JYmUit0kKq8a/fYwTKMrAIu+0Xb2h4OxkiYrmyJkG5Fd0b1VvOlCmVUgGBLYZcYbwei+4bG54xbVwE6kV3ylbyfEmNJwoOgsGKmzuV/s4Od5AF1iFteuEKeg7CZWZlBcVIUJKRIbIn0lKL1jHIEmqWAJMqjnBANYU9cxLMY+z6S5NY0n0AgJ96b9zJOQImspYPGeHged6Hb2nv6mntMEydLV5/9rXp2l5HVLi1F8Gc+WPxm2sIW/mjPLjz//IfiA5ryRmJL0kMPaHIMK0GHUysO3c9tZh7ywM4Rn5o8I+M6TZ2P7zIl5M5cw7yn0CJBnU+TocWR3QnUWk2wOmEZsyG5wpyNyb/EkrDm/DAXJNQaN3i3Ef9qVxTxS1kb2p8+2o2tMNTuLjbcdkShoCzwXTrw725jZbhVoQCbE9N8Op+9PST/nq9je/tW7wFI+3IteuTcxJUriwxjrlWrX7T2esZMme89nH9mOzSWA+4lCCBQnHNSpjG/mw5sNsVhHQLINqWk+x9ZNhN9ZwcVVbdbwXi+W/+ehF+9B0XWZJdVOJx8KykaBc6Hub+JOvLenTIS9neAAJoUT9QpYzzjeVPxew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qk9zKmA1N8VCS92ftpZgou7/8NUAGMqH/WE7Z3s7yffB0oVswrx/Emsxhqkp/PGuWf7Xy6KAyYZNZPQGqCBRj0UDmSeqHkoKuO5bS2UiKaOEqxOU1DFY6pnwGTNUDAxyE87xuTujOXHw+qIt7nS0bVJCS9+29WEQJ3xGcv51pPKcVleNNC3U23fFrEgqGFX82ezJoGJxEzAqwBixayfs5+sC1iRklhaYbcrv+I9MsRAldiEObEhqG+YLvXaMh54fiolJnFyavpr1E3euq2gPmKnLVbIc+wRTixt8LnlZT73pZ1qY46K7xsH3caw6cYiFCMjsCRY1TYwoVoK/iV1OiNJF5mVGXgEoy36H427B1j2CXOrvubbVG9RpygbjFuHTbsfLk/eACs9xUTvSYYak/x22gYoG2u67Tdgc5vylkEZlknN6kCLDFfFtUy+sMBeRVHGB+8eSRyu0SNispoQPcYZPTbQIKtBC6O6OdJgjG9sqaRbB/QS3kKOWMdDdERrSd4OeZvW+elTEE2nGP3YeUKqlUOIBdBeLr+Lr4P+Pu07dGEISGqHdILqgJEpX9OUdMw0tHjKB2MNziy2hnXn22FJmvez/QrlOvOV4GE+p3D8gQtjfGIVaWMowV5IENECZRw2Ozz3iKnxhvtRtuNTV9wT35j0BwzhcKw498SXuAH8jcI4Mck3bTvuYWtQNmZcwdJKksEnJmPLwTXxisyc9JL1CkHE4Ytg4myxuvZl4zoOUyoeDtjGkOPfkcLt2+DXBIKjOIWcUFFzppft7orgssepnTknz0MR9mJXkyJoY5lVa9+Lr2tNFl+dQ/SHxbQ9KrKgsIKcgOSXE6poE4WMfvlU94PdxvEwbmXxYqQ7efyKZZVyUwgARuTX08Iyb/f75EqemB0FnndMexgwVrAFYYVFbfmgC9W8ApK1DpQWd9lrqDNb1wkhbao/WoEDYARTNsuclVqp4L3BGEtottmLBKw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 106277cb-4657-404c-d8f9-08d9df757f0e 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:58.7201 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 10/18] lavc/h264_parse: stop including h264dec.h 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fGMA0CNzDFWB From: Anton Khirnov It is unnecessary and only files that are parts of the decoder (as opposed to standalone code called by the decoder) are allowed to include h264dec.h --- libavcodec/h264_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 1c1d1c04b0..97ddf0e437 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -20,9 +20,11 @@ #include "get_bits.h" #include "golomb.h" #include "h264.h" -#include "h264dec.h" +#include "h264pred.h" #include "h264_parse.h" #include "h264_ps.h" +#include "h2645_parse.h" +#include "mpegutils.h" int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos, From patchwork Mon Jan 24 20:09:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33824 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15777iov; Mon, 24 Jan 2022 12:11:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2uxfjJof5rmjLJ0zN39G8mWPxruXCP0FbHF9CLfA0QTK9P2I68UjhJf0bPhBkeU4N6Pih X-Received: by 2002:a17:906:4f90:: with SMTP id o16mr13695219eju.626.1643055087147; Mon, 24 Jan 2022 12:11:27 -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 x25si8664895edq.325.2022.01.24.12.11.26; Mon, 24 Jan 2022 12:11:27 -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=uWMErS6j; 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 28DE368B1B6; Mon, 24 Jan 2022 22:10:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5322368B14E for ; Mon, 24 Jan 2022 22:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eQcZodW3qv67TGxKNcBOWVU0/3PGlDbuqkC3RaxaxLxie8WLb+Ik7hi3VqLtzZ3VKRC6LfJoOFHDBTQmp7ZwU3A+arD6w0X7iR/9t67AbA3sLphTyEDn10/biRDRODzyNUPaCbfcjlA8JtZGqRaiJ6j1aBxEsefdGaYobVkq9JZTEqzE0mbBNXepohbJB3NxwjlyAIW6Bqdg/oCnFxQzEr80Nzks4Ff/iGNmAmim2Q/lCfL16V69/P2vrKsfRXnG4zbKdTM+uLce1dThpVP20RiSFAjS2KHgLXx+1LkHBW96cZ3xGTiKOXzU+lJ/ClqP3vGe4Z78THzVvYsL/3esWg== 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=iuzL7Fji8v+OqKs0brrr8z3tLqxvXFQedoXY/43dXRk=; b=bD1wP9J4EVa3fCmuKVkzJHMd9FRT5EXsTNjI+X013igV7jkqKjesBdblEzSKcEk/3AFTolKc4e1YVc5DKFa2WRQZt8Qj9/Dt/J6r6KHWmhWLG7yWmjXPni9fWZzvslcm0Ix3I8TX44Fo8ihb58lJVcfd6CZB9rq4j0i/qCqgF0NTVTKr5s5RRJc/2MrX62sfmPEFruudV+5z9riNkuSbQGHMvfLK/+dtyE+4SXDHgP3ORssJPuZbsXUj3JKrc87rI72Hysda5ahcEMTVN+f8Oa6CWqpaF0+Tz7Pa8yhXeXuWU9AVz9uKOZKcp/Qly+AJ3MqQn5tWyz2g42WVF/cMew== 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=iuzL7Fji8v+OqKs0brrr8z3tLqxvXFQedoXY/43dXRk=; b=uWMErS6jNVj6FBCYIAc9pIVAyUbsYcbXZUaNImPI/zzRdFPAS5w4dElzE3rswnYg5osKdXvFNetDYD/q5HV3+gvnehdIY9ztNDLjFRDcil76QxywjJfeGODOh7A3ZwYuMBybTUni3ogkRpRvwmLLL9U97OfhA/ebasRfsiKcSi7+8wf4KkxWgiY6SN9jVCKJGlaCf3K0dkK4+ghkhRaxrjZrdx2M/8uxcIygOqtmrmldOryRFnXmUpLJzKh9UNmcLzueIo3P2Mrw1hlLb0NBeAYODu4ixEWLSUoLNT45WeAZQavHfhbbMj00Ca2mMGAoRuTM9O77aIhQplWXUpvG8w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:00 +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:10:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:24 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [uVn594QEoxv1CYwacqMpF9VX21WgQU9b] 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-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93729bc3-b210-476e-56f9-08d9df757fcb X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lbHIzMNiKzT56jF4kgHgB13RueNs1rZBsrYGqTkOh0zZRWFvRLMyP+b7wik2AICknQpR4+S8yOQ+mUOjIi9Nt4UNtGurZuMbExGAyIyx/IT1q/r5xPMe5Fj/HjrQajtRKoPIPr2cCxofmn29jJW+PweUQQ8QumP7Sr3YiaeOO7ZpJbBo5/ZuEgar6MZAzwro21AVMCvq/oJKU5U/+6SWpeF7M5fthTGSX7vEdPbDuKnyenKE6ycguGeZShT0RbTiR+9Q8B0GufgiSWf+5M3uIlCeerrpRpTXx0wVUesQmm/hYCnfG6o17UiQaNyomB+KkC9PzVBuKognlJ+dsS1jc5Ix2d5vTv4ANzTUFXMXDL2kvlUARUCHtweCPjFHEAU9xH6C+mvMfr96hTe8FMXW55/APWs0Rda8INA7cv+ytrktlEovQcnFLk2wkY9C1ybZ4b9Y/Lfz/Lw8v2gN8MbHIHH2GqD9+crmVmKpuLDCEJtl0IxYfPU4nY2UBDn6/Gn0edjYo3kzS946eISWjesxN587GTGF0eQU1YAyvlUSGRr6XTmSs90h8KH8yDHfqYjmro83K4/Txa/v7XTKeA2Ymw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bdRdrZ1SPZanYDgRcIO5naIpNpRw1zEzYT1LrX+dOz/Pf22ZQFUIPcGlDU7l818uWxGyMOE3nYq8zBq5J+opkRr+P2GyVqHMK6TKgjm7iMsKoFc90gf7ODyjvQ7dqDlZkuDMbo/afKB9bMI85a4EothdSkzpq8H3IJtXOhGiwiP3hdhF5xrsRI4RRJ6O9lYnToKGhE5NweZs2f06gXuU3cPGyI94cyM+ZK46KG9TEkBI/c3IaYbe4aVIFpH4JYfh0xDcQY0OAc+c9jS5mgB1eoINV4LWfKFS65VtmEpZBEmLHjecLPMfl0MI/QWgWS3AudVqnlKCe548ylYforIwoZ8iPf1H+Kvyw2wStAHZ3aVOiHVtQRmS0HLhcYyhIlwPyuioX2tLFuWTXaDlNoRCSPl69Exc/xa2urNW5/HPLcNcrFCAlm2kVbbp/elNtK+33COg8Ed/hB2F/kIC/LuTqZC1mDWFd7it/7PASsX1KfXXk/AdbHwSv+3L8vc60abZgYSB+i87ME1ys3l6GBWrzvZy8iBjwDoPiiDPVKflSXC/PcXQ5sVxmIVsGSmUEHkHPZX5ekty0rA6vrPtzm0/zVzg4EqhRo7tcLfWHUfj04F8xezA0+fTWin3PLobq0Fz2NRwvUDjwp6+4grJrT2U79NtqofT7GbQ3Jq31ttfUODxgvFzVPoGjUy91+guXgsC9gP9RCXYg5nbDk363HgriCN2nLwQ/zGcqcuJ70bONxABzGdFVDm9dV21o98bqpEGMzP7mnfUY5rmnB42dwrRmy0Mj+hXFd4LlADDuUEdUfZNf8neJew149w8v9sFc8tJgjs1wECkLhJSfF/k2tlPRLL8sDjVdQeeloa5km12dJgXY9YQIeEt8MYJMjLgsDo5XfmZAb2ZYdZ07gZ/hXjCQgaMkAveqyzJ4aDNWZz2W39K4kH9fvIdZJD05BCyC3paP5C9J5Y2YZH/7fAgct9mDg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93729bc3-b210-476e-56f9-08d9df757fcb 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:59.9554 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 11/18] lavc/h264: move MB_TYPE defs from h264dec.h to h264_parse 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ux9/jquZoLS8 From: Anton Khirnov Allows to stop including h264dec.h in h264data.c. --- libavcodec/h264_parse.h | 3 +++ libavcodec/h264data.c | 2 +- libavcodec/h264dec.h | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 52b224f4c5..201d983952 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -33,6 +33,9 @@ #include "get_bits.h" #include "h264_ps.h" +#define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit +#define MB_TYPE_8x8DCT 0x01000000 + // This table must be here because scan8[constant] must be known at compiletime static const uint8_t scan8[16 * 3 + 3] = { 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8, diff --git a/libavcodec/h264data.c b/libavcodec/h264data.c index eb8728a9db..3e9e68cb04 100644 --- a/libavcodec/h264data.c +++ b/libavcodec/h264data.c @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" -#include "h264dec.h" +#include "h264_parse.h" #include "h264data.h" #include "mpegutils.h" diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 5266420fa1..f623d60893 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -95,8 +95,6 @@ #define CHROMA422(h) ((h)->ps.sps->chroma_format_idc == 2) #define CHROMA444(h) ((h)->ps.sps->chroma_format_idc == 3) -#define MB_TYPE_REF0 MB_TYPE_ACPRED // dirty but it fits in 16 bit -#define MB_TYPE_8x8DCT 0x01000000 #define IS_REF0(a) ((a) & MB_TYPE_REF0) #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) From patchwork Mon Jan 24 20:09:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33825 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15867iov; Mon, 24 Jan 2022 12:11:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwk+4lwwrnxISkZTQlLXIAs61MTfg+q4WjY7u9QjpcEvS3NnCo8wDxOaVFNq6gReyR+AbZE X-Received: by 2002:a05:6402:31e9:: with SMTP id dy9mr17339783edb.65.1643055096841; Mon, 24 Jan 2022 12:11:36 -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 ss23si9298728ejc.16.2022.01.24.12.11.36; Mon, 24 Jan 2022 12:11:36 -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=jUVXofZK; 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 2C13368B1E1; Mon, 24 Jan 2022 22:10:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EB8868B176 for ; Mon, 24 Jan 2022 22:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kzRXQucu8CoQiswbZnf/fIQJYEHEhYI9MnUkRg14LUtYNbK8TJFvj9NgRc5IKU7sbSlWjgNgtsKvizKa1B9M+4f2siDnGOjvezO61qBpwjxZER+6MCSFh32hNcxlG+WD4NWLFOWLibVnJFNHXdEJNyu4+0WWt88vZuDibCcY5Qwi5Qzc+tr5JF45F7v7YsGbIBBhanZzFV45FbAbTXDVtdZWll+kxTqCBx3JUfkCotU+XSGLKS8P2mR83WA5YzN4WQhVE/7G+YJ3c0o8/hNDKPTZPPzNRvRRoQDl+bQsZQQEToKEMarGBusz76GH+n6mx0qAggt50D9YnUS5pMvEoA== 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=c5lXJ4ZHBJt2U8sRH97ODR/8drDvMWx3tTCDKN+8tIU=; b=c30IHk+XScYgYI6k/RsdOTDyut9dqECpLKQmM+wwPjTlOc3TEB2duRT1t0lPlovZfxs7fHSpJJ7EbexgpRDv8fAgaIdt8O7A726dvbfNQiH6fKptbSzxxyyEhrln5SdGcIp2yBhraaF4vzdSRpob0fHP3CWlre2ThXzjdd2akS+G9stMjD6KgfPVoviIDG30PF9P7vaUJ4CvyDL6PLJ1M21Zx5CWp5zeZvKw8TVrK2Nd7L+0kP7mjjbnDjdsUD46xIjoC2dKuGobndToTzvL200FUpupd1rLIkBl9J0NCmNVvyx+qZpRnSnzV6Lz1oz9mp4onOU91UBBEiLAN3qH8A== 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=c5lXJ4ZHBJt2U8sRH97ODR/8drDvMWx3tTCDKN+8tIU=; b=jUVXofZKY3w9N+6Rjw0fTq4HsSOqJKuYu0FaPmlxL/flFDZ8z8DA+w6bdLlCxS4nO3lf3R1oqVz+5FmcM+VqwFJpPH5NAfacMHR0jhPucqcAs+8pVt4A5NsHVhTeQVy+F2NlwqqWGnGRuA1ZEuUjR/pessEa4OOvas6nvszHVoXzUQcdJ7TLkwAbivMkLYfXDoGCOudEvx7VvhHwPYSDI/Y/c4jp1uw9JXJaqnwF4jWZNJmAnqewTpfk+6FLlkm26abPwrlAyD1bOTWSw0LmdjtEE67ATdS65aUHjJoP+kD1iJ0TZnlK4Ci+brAoNcMme/tqznicE5e96JxRCs3H3w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:04 +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:10:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [Zfj1+qIptY3joabVRHgZ8d6qr8b28jfF] 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-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a2e49d7-baf6-4540-ba28-08d9df758298 X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GJIAO58oV4VwvdND8Pujamb9feIPs6cIiza2NeJr9K0TeYZnN+dlrIxMh78AmokLejA7ZLxO0DKLthniY5LgZ7UsD8A2sreuxPB80VzQqwVtu2ljR1zz4Ga4mY5o+bai2Cn3nWa9uxLPlmNeLwbvPNgua1MOOG1jfwJIIdnp3xaRqCW5xDL97j1c2IZ5an/7wduixMc48cm628SaP/YwFpj8UI3FCt3JMwUcWAoXpObt+3NffI1p/3lpkLsRnn25SUjt8ak3BFKMW1LgHw7BuOT0Au6U25Nk1wg/DpMGT17ZQquo8/sk1zFtfTJs8D6bUPtSR4nDUsaR3PNsJ69f6PeFTzk+9Qu/GPb9OfBR7ITsYup+9obzmJsE1VJSWSjt8ESDGW974pTqoLrpJJ1hRrphjRS4T02ONkCoCwivCOIptwlvH7s5qP9ewnwkUg4eO0pv2+53lMCrpmtWHtA2cUxqGJQTutF8OAfE3q/+7K0nRjWAJD+o6XnSBrUrnY/VVF80V1L7A4TLuCuQ1tMU/GLLDtXPTHLOyxFHcTLfFJzwMMcQWFhAbixYkp85WlkcsGfNz++w/G5NtufFPz9GRg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HQ1/8MUflayM8f6waRdDjIc//C/ox6a4PxxtAniyOxN6BTPV0iwa0ejUBfcLLkPKm9IQHxdJONWPCHPqpVwc96nMFaW0qFFsevbonIDQsSoo8U3f4f9ijtFUZZY3IDfXas38O7QWyKkwmE2MhV3zvy1QrDSy1jReRJ7NKcYXEU1N1tkIPmsboUfpw1aafwzmkRFkCy71RYj9HBAjYjtKQ3P5tGBmbMqloUbUlqqDsLc+/RHRu0YrpOhp1J1AmPyaopIaJQ8MUZEQewHWU1zSEVm9ys7lap5kCLrBJ+sODhLqDlMBrhrM/XrDjhWoZIQ1Ary7PCvbuTr6ZTBiGmtKTDblDpp90f7yB2BdcwRcDNEDRyNFBbzTqq/JqWkJFfFKV4fGmHzrgD7UEaX0LpAWbOZYaAx2/XFHRI5UIZNfVWNwHyqx8W9PUugPoBLoYef8TCy+6jna/q0DP53S4zX6vazv67hs4fU6Wmia69xsZucTzM6pjzuuvflJ1NIth21xU2vPjSDhRN+ZFuzM6/4B1QzdhYvqutjIJ3Stqt/b4/BEsLHUhCWF1rM1ONf4jTLteSzCerhPxXcvyzTAgheAVGgXX4QTFB4LriaF2Jnq3XnP9UVIIoeUhijUZ13+yP93cFInzxGLTdh6JZ9ADqH2Ye7mE/JcT0hvSPnas6bUtZpW1FsRei1kuBu1/RTVSvfKzQRBNlR0+tprEQwj8miNRJBCQG1xQbGLm1eF3oDIdgy4dIin2TtlX3JtQdSPOd/OEtGHlRzMvWrCZfZcVPGi1aQm0WuPZCgzJ5Qp2mNRjQMdB6y/+pA/L2U81D+sQz8pZFieNB2DQ/hraL4WAtIqMk52khocqTVEih7tudHL5AR5wA84IUW/NQWJDrSbRvtHHlZgaNn2wEkPitZ/lF8sC/nDlJzTAf6l59BhnTUfDsDK8BUWW7D6nwYIJFwb2Yg+h+qHC/KWuOGDX4PPi8ifog== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2e49d7-baf6-4540-ba28-08d9df758298 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:10:04.6881 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 12/18] lavc/vdpau: stop unnecessarily including h264dec 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gcWnju2ikJWm From: Anton Khirnov --- libavcodec/vdpau.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 7c29746adb..f96ac15e2a 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -26,7 +26,6 @@ #include "avcodec.h" #include "decode.h" #include "internal.h" -#include "h264dec.h" #include "vc1.h" #include "vdpau.h" #include "vdpau_internal.h" From patchwork Mon Jan 24 20:09:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33826 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp15971iov; Mon, 24 Jan 2022 12:11:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJyFvlopC+I7gbEWjgOBzXz8C9uZLM9JHmCe15vIiXw/5101NEt82W5aMpWy9p0kCDTE6dBH X-Received: by 2002:a17:906:c105:: with SMTP id do5mr13633359ejc.665.1643055108045; Mon, 24 Jan 2022 12:11:48 -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 qk39si665534ejc.795.2022.01.24.12.11.47; Mon, 24 Jan 2022 12:11:48 -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=GrQru52r; 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 1162B68B1C2; Mon, 24 Jan 2022 22:10:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A50468B14E for ; Mon, 24 Jan 2022 22:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a2ij8Ougj1+D6yAcifDaUYOK0JyO3uvfKhZvsDoawEb3G6eGvaq5HYzqhgVh7b1OW6KxeK7swWq/e8l1Ffuw/XWAg16Sl7bT0qrj+I9cKplZb17wU4c9CcqYdapMU0thvRDjc60GCJoIN+TcvL2jy4TjfxJHMQOE6uRGy7pqqhGznof8x4klPFACSxJLujMkuHgD/Ausvsww6hshxbKfJmhDuHUEuQ04qsNX6QSmM3p4VDAGN0WVZFnpL//EGD9kdg6PZHXgPclvCvu3Hji2YM9Z+s8QOgP7YtwqWpfUm3Oc+skAQ9QjzO7wi+u2V26KJmtmAn8XS6CZdiMh8yyM6g== 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=emjz9LVdbWEZ5NFBkNuNt5okRisuQVXcUxuIywSDg+M=; b=UbDukIht4xN7jTMKH3ZEsVZA4iwMVAhStz+Zh4GM6VWaVsQbQ/HmXEvbhJN6G48nPeP2rWNUCQQnukGjDKuWJ8JKK1SRcTVyo9wEKIjR52Z4PU7xZ3gyXDeScaEuLm3ka8iqkU2DdCeUChvPqcrpRFdUsFmTm8q1TNyqalvKd9WPf6ah44/YOWEQ41xTAKHZEGJJdPYahvQyxC6/2VqknENh3ZhPHdnGKF05IR1NDYPX9ol6U8sQW5VkZ1sWblkQy58/vAq9DyjjhETZGLmouQlgLPpUe7CncH6cL7rzk5Si522KQR1TfYtqLHLuYIsBiWTaj2f+YbzKjxJ9smzEIg== 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=emjz9LVdbWEZ5NFBkNuNt5okRisuQVXcUxuIywSDg+M=; b=GrQru52rWRfCbnH6ZiRHBev411SLP6BrSbk2wLvEAMquPt3KUG9dJRViGDPpd57XEe50sGdxrNXsGrskjKvHW4bhxUaphp2wDWE5fUaEjE+QDWe6OAMdfZohsaUZbGbRXhc2OOXdp2XKxExL0LrOb3HRS4d1c0PIpSPn6xG4xewlLd8qf9ACjgEQHk4gt1HH2ygPAlDsSpfNPeVmBq65+eZbwhkX2Do5vXBYU9wdepj49UoDCXOv/qX3d183ZBiYv0CslydJ26ZXgdQLuvK92sdPSGuH05537woPXnb45y3XKAQlwBPLaPHcBRwvRKlxXLLOJhmsnzQOMPefUeBycg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:05 +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:10:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [BHJCGMp8YSB6q6BtidfiN+k0gZXUeC47] 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-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 166cd176-87ab-4b56-85a5-08d9df75832c X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /qY/45HzNHgPrGaGcaLdFWk+pHIkWc4bfzJb1ghJ3JjMrRgRyVUqivxCVmm88BGoY71ep/6tnIFWi4ZFdbMZXCanxrdeh0SWNZMyA8F9LjT3xJtKKp3RtfND91koIEt7l+4LjwGS8yG7eljAzIxc4/9su5iW6fF5paq1pxec9X757UpfWPVlxIb0RHVKtz5WdeGagXUAHMxKe/5Kp+ZEDYyBauLUsx7/aoBOjrKBsekvThuAFgoE7lRHNG7FAbd0PVjCxcSvUsY2r63AyUbs5sm4kIDeaIgxZtu4H7/7u+i2jpyBs+qvpuTXYyEztRZP2qfkYN/AkXjlXOIndn0l659I2lVuDzriPR6LVm2xvWUNhzSfAkGfzXGq4d+K4k8CXbbCLbL3jAB4OSfN2u80PDHTKltQb7MIqG1DEsOrsOQs5A6z9AyUaJANDqiC5u07Xef7NERtkwZh5vaSpVcGIwUSR8briCuUs4KcewFQ+fKfXOjpRkTD6Ny2ExUuKqV8J68wedM/mvrx96gL2bYy3f+SXgZ2dfbCsM2yJGfLOxR2yYNaPzBQZm1Q7aTr7G7nztW7Q6ZfRSAER3LviJaN0g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DrTkjCoxMw8Pt71de/I2sgHYrWfdJyCBdF58irjMirDDfid+T+vlkOT6eEW1cv6l1PUAvSiOkyUG0jYiyX6HWw+ekbrdunZupn/7oM3axzqvRYaaORuggLBb7/1vOZHKGxx+2/ZyBeQPBwtpAZIrp3mq/XgN4vF8z2ebO61jjZQIEFpjnuvzKyj+7jvfTjQoKmqLzZ+bf0wx0WfU+9MY2DTFdAA9dccfAiHJ4ZAU6z6Ui8bJJnZPke1ZOP2K8EgKOYBITt/W7Jc5i6iKkEFsmuvtAxyv8wPPwqXQge98SI0t2SVjyOYnE6hUWpPrSJnVo3fAnkD89AFf6lLCfyechWEDl8qbmaSmRwBIAVct1TdFv+KH+7hY5NVWerZyCFdDigqD8mQ0p77TmyFy/PYJygMVB+NwjQ51nSMDRvd96sIg4vv0PTMuVc/smzx2G5egO2Lt25KvhUymUxZW+qJncUTWWxCTCOuP9U9Hc5O5BWG78wnGv2gZncspsHgd/C2SgVJBs9HNO9mM2eztwtHBB3lcp/PPmf+MogIIz/y8LOc3duAwnvMwO+6uwXoI/iG/bSzyci6dEjqW9tVoac+g6ZAl+LseqV8TXkmAQL3hALYNA+nGAXRF8mv5vqLpr/gRbQS47Bb2U/U0rM9DSetv7IuxJAW1UfvyUxi/HouBYeH8/tR1qRj2x/OVJGkA0Jw6IkDiCU/UrQKzZMYISX64afMDoe+d868ld/1XEtWFMly4FsyIR+M3BmfxOeusBxeNZ7qKzEr+C4ExeDyu9dsi45Hr60NAUXianLO4ZM5p/Ck00Aarmdrs3SA+v7D8PNVX0LkCd7UZZXnKxuXy31OCZXGu0ddZgzl35++FvSSPba+yPPzo0Ffbe+JnhyMuhXcRnejfgAp3m0LUgLpUSDXSfW2ckDpt7KARS5UTwA9SgDVQWX3Z3UBS0rrZ3xS6GCL8KQrm5Q6ylfoY3f0ieeSwCw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 166cd176-87ab-4b56-85a5-08d9df75832c 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:10:05.6580 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 13/18] lavc/x86/h264_qpel: stop unnecessarily including h264dec 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZFy28eYQ2nWz From: Anton Khirnov --- libavcodec/x86/h264_qpel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 320d98933a..dda50ded89 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -24,7 +24,6 @@ #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/h264dec.h" #include "libavcodec/h264qpel.h" #include "libavcodec/pixels.h" #include "fpel.h" From patchwork Mon Jan 24 20:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16090iov; Mon, 24 Jan 2022 12:11:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmuP+WwJHGy7WiLeM02YmxCzqJp49zisKW4+jAgrkFuXlAsRvmQOaHAHlNiW3s1+9zJtf2 X-Received: by 2002:a17:907:8a15:: with SMTP id sc21mr6625273ejc.312.1643055119306; Mon, 24 Jan 2022 12:11:59 -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 hz5si9655528ejc.205.2022.01.24.12.11.58; Mon, 24 Jan 2022 12:11:59 -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=oMGLsUog; 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 E8DEE68B1F8; Mon, 24 Jan 2022 22:10:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A53FC68B1AF for ; Mon, 24 Jan 2022 22:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExWciepWwIF2iE/Hw+i08QgERi/vbj/Dcoq+yf2Xut4vjoYBi+Vd8ey4oVYkl/7pyeV+AcDMKsM50AOGlMdK5AcySc2he45fernwgm+sq2Eo2SsgbmZABjIFQcqJxAAmgtyJz4VHeciAXci/liwEpRlnh0ftqortfvnCxFWdIyCL2fY5/VNpqRxHCk5eaZw8jSxdhzZRL3/5tnWSNOb+sl7pphc62WauKrgYJcukI0L8Qtk2b+Ni45/ATgikYEZtN5l48RfMYcSfw3fEW7+hwpvuRICQlxz8W5Umj4jxa/APILNN96Mw/wFdE75t31hv55eNPwuWDgXEYPIQTNKLhQ== 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=e3iOUsyj/eEaVVErgsm4CtXat9rxTvNG28dA2N13cnE=; b=ZiJBOWc68pfdyO7pOTubS6lsoKgKyrlv1SfsyL7jwaAZy6xSJ0nOW2pljLBOfv/F0DY9RP3vJU+fbtfzG9jWgwHmbYnKLs7VA7rBKSH7uF4rCDrBy/MG25ck1OEwjFS4NjyYS5aY2Hdg9NcwrSl5M8GII8u+4ZhqvRAL2/O2NMWpcYNxi8A3W4O8sqw8aahM8ykhgWG5ZuE4JKb3CX1Qy6M8a2OY9PWzxZ1WAcypCb+CoNsO5t8Rxv2E6SCuioSIYhRvB6vqdijRssvHOas4/rbCKaVy8dnSpQRCxFhq6b+XZcs28oc5pKxdJIzKdOZXW+YztDiCK79NnA1CeGny1A== 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=e3iOUsyj/eEaVVErgsm4CtXat9rxTvNG28dA2N13cnE=; b=oMGLsUogE7eQn6Bm/psjHi2fjkznIO2TzG67szt7CqR9SgA6elcjvbkRAXSGYnqST943WQyBd+/tnT+wjsoRDxX2RbwMW5YrkoBc81iaGVBvfbywqQJxGUJun2TsHBEPBUpeyZ/NT6LCEFkcbtrK18WhtPiVnF+a5EutaD1vvFr7TPVaY1dFGlZ6gL1rN5jrM+LKaCGx728nNTzjFLLLT39pyMlik6ZixH3N7Pxk26g0av7fLCrf1ipGZzJymF1cKB0BaIkL3YgZN80NUuV8x9bQA0lGEdt+RsSpTRpmev75suS1cvpR1XiOimgKDmlbNqHIiJ3PLMtP/xLi37kn3g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:06 +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:10:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [TuI0FlvBtTAqchbWYdeZDaHLjXNf52jF] 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-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d716da4-2def-4746-96cc-08d9df7583b4 X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5McoFJ/NKNkpTMzpE4PNfPlKZ39E7xD9OmOLgR5Qm8oUmKN2TONdUmkXTNd9nzTsPLQVsNUQMXqeLW4hbj2mKhBNdzq3iIsxn+wkepZya7Mr1kfa0pYpmXrUfA3Svlv54n7V8ni2m6iqdGG2jhkBQucrVhyi7x7muCNxWvsYRFaPfTAclETtmB8nxI3Wo3W+JaChtdXNK2ZcM3qTAc8+09k/LiiN6xCjlB+JlNQP8Y2w0VjtDz888ghotFv4lS5maa7YKX4+9yB9H8bbXPQUasLSWovhLKHknnznaaCwOGyV9jHkhOz6TeFPqYGWPKS2Lr1bwt7mS5pE6Fvi5wOjmkGh/vJsAQ3NWkD9yJZFw5Iz2keo4OH9ybSRzC9v0Omo1xeOnQEVXWhD5JlM51S7sjw92d/1RsLJER+iFP5HfuKMKkXEbdaX7qCa7CFSFQb1SL9GkyB5PNUHqW15xIvmh/AUkPC5awCdr5ycYRe4JoQS7TeozC8aEbTEB+IPrXd2J6NOJCPIBN5KSSIr7ZeZYUrOuSMwoP5U/V030kFitqSgaDt4l14Lm0zNzMw2LVpHWAZAeOK8Ogh6X0GivnE4qw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ecWcKkrWat35Z2pMZaBKXwQaQjHuEk5hpzToSXyLMdLpFDtWIl3ynee682hFG32ejC4fMimKABuUorIMR7fhRUmBDxR+2/9iO/oFL9SUzYgTVvbNtjuk919Zd34xql3cmy+GzyFiQ8bnVrH3+xzgh4zdcp3m9FGTK2pWLdpNECsX0pr5HcrIKeD9q1P8eVD2+aRLSEFEV1kedReht4Ja22IwJmXqNNPGGOzU6A/o7i8seaE7/YCD5n3jRze0k+WnWyAgTzKuG5z+Kovpf1JQH5KdXW7kWFwC7+l+vjzNEJ4d9Fp27ymCb8Ja1pOFP6HUmK4CIJynmjYdpEz8P5nGI0KoSI9eNCvfMpmPgRPPNQSR4LrCRPNgsJri1mQFfvmrM2CDDBaD5+0LYMmjsAaRxr37gkYaw1waHx6OO9L/0dl/eBLMixLUeErGIWeYcTO7vpbKSU7hp1yCeA5t9MsHacDYLLItivExjBCJdvhFg7kCPwuFR8n2ie1a82LGpEd9dBjP++6XloJlANP4OiDAGdh6CtkCZRSnG0FkPdMRFoLnhWfg8AYZioFncQN9tzoNs4mb25xi+8K3kC4BQAx9JJmzMahEOpMy7eiyKA5C7ddZOzUDRBM4hZ2MLlcManIZF7hcynDtCAThqPpHtSuC9dhObg2NPXrng4gN4sMpE6ziFSUGVqjPBY++xTiEZ1cuitI6LnJQQUvf8em/aNE7jrZo3mhB5R0ViKLHRju65xkI9+j7tlTf4Mrs0AaO2sMukTZUVWc9GNtG49GpH3JADjjgdixCjJuPy8/XVbq6mbfO5b9e4s+YL60cW+rzyDYan44wa2FGA3ppXhKh0jDYwLnJXbzY8hWAKmEcy3StsNv2lAADduEOI7hCtCFdFDj/CtII+uxemLLpzk49PMDJ3RSTQ3/k2glRw33WqlVkJPlmv0EdzYziM1wOP46BcfUVoea9VFC5P1UWrgEOxbHitA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d716da4-2def-4746-96cc-08d9df7583b4 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:10:06.5484 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 14/18] lavc/svq3: stop including h264dec.h 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9McrCtP9nsAv From: Anton Khirnov The only thing that is actually used directly from there is the PART_NOT_AVAILABLE constant, which can be trivially copied to svq3 decoder itself. Otherwise it only depends on other indirectly included headers. --- libavcodec/svq3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a3f434ff8d..f06404da9d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -49,13 +49,16 @@ #include "internal.h" #include "avcodec.h" #include "mpegutils.h" -#include "h264dec.h" #include "h264data.h" +#include "h264dsp.h" +#include "h264pred.h" +#include "h264_parse.h" #include "golomb.h" #include "hpeldsp.h" #include "mathops.h" #include "rectangle.h" #include "tpeldsp.h" +#include "videodsp.h" #if CONFIG_ZLIB #include @@ -63,6 +66,8 @@ #include "svq1.h" +#define PART_NOT_AVAILABLE -2 + /** * @file * svq3 decoder. From patchwork Mon Jan 24 20:09:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33828 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16206iov; Mon, 24 Jan 2022 12:12:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHbWKhsvwSaz64Mhj3XbD9xhMy8IebwB6sphfk9smblUcia5isDx1D1lT78M92TvYFfKXn X-Received: by 2002:a17:906:a896:: with SMTP id ha22mr13668196ejb.734.1643055130046; Mon, 24 Jan 2022 12:12:10 -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 e22si8239140ejm.107.2022.01.24.12.12.09; Mon, 24 Jan 2022 12:12:10 -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=JY+zjw7g; 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 D734368B204; Mon, 24 Jan 2022 22:10:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069044.outbound.protection.outlook.com [40.92.69.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0E1B68B176 for ; Mon, 24 Jan 2022 22:10:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mksc2AEUDwzE0hfq0tTTECVJ+rGjAX+xN0j8H4u3iWDaZtwds4nuy+A6Tu48yNVQS2q3F2t478qHMtCxFugs83bYUl6Jk1X6oWjPuiYb6wbDed0qn0lVE2nm37wuyJWHyNdwGo6Z9hIsASZwmyyoU+306vug5wCX0JEKMdyI3f+N/4QW1NMv8PhqrBjcA3H2sivRXrBONs5KG8hxD38gBqjxqTGJnZg82ZQ0/f6Ca8z41qrBat29s01LsXo4oK3UWC5LGmH16Ks5QP6YBvymS1Iz2dl+i+DhYsZiJ/zdB3PEevSfEjguTtSKqNxhy3kxizEvxFil0jhQVd0qqRPK9Q== 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=JjZCXeGVXcxiu92Z8Yo+Hw6tgpwYkbzzlHPONtZsEw4=; b=UfFyLDBhy3HVt5zmdFxD7o8vWT+QXHSt9J3Ytfuck2IrVKic7pWXwtdg+VSv3gddjvSbf8XWFIdD4LZ64SE0ag0zTLWzAJTMW6luVOpDIMQfXxCAB5U35ymUJhz9G6TypBIG6/QB1R4PT3OzwYSWnaobd/8PudaJ7hCK3Bk4AOBxiYDp+c5mbLCL4IP9TB6mOAg4TsU2FuxlgDoerYP6iWUqRbkWTLkSbI3SKh5+4xwaXy8QdyiIYEO9TIl1NY82kzCtZaSajsPkY5iTAyHYl4TAmliguWCPUtIXuutRQPq2iyEYDyNYxKUq9DeV4QN1BcahmONbS+QnH+A//M2apA== 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=JjZCXeGVXcxiu92Z8Yo+Hw6tgpwYkbzzlHPONtZsEw4=; b=JY+zjw7gKkkFTG3delMUq/Wg0Qu1vKAOe2lIzFlRr3tJjxDx1QDguGprx/uEmfzVnNqatHpDgd1B4PUKA+nx6u+sbXU5p6XS0nzR2nYkiUUEnHxllGlTaayo5FcZRABqDqSXtqgvC+HXUMdLHaH/25vvQzxKM0U2adP5uokAcgLSWlej6UyrQ1uNJ+4cpLBOaXwlyZyCuDwnUu3DLxLKoA40fygdfhWII7NlA6hJO07IrB4CVlGZJehjHw6MqDjFoxOjKhwzBjt0tAUwKO7NuUOggY4jqbiZRnYmXR91IBVQTnYUgcyGU8BZBJzkArTO8HcT202CnlPvzWSpXO4I9g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:07 +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:10:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:28 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [bogDiONOgvUla78OrKpZ//JiGD6YPAci] 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-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3cbf06cf-7c1a-49cb-8906-08d9df75844f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxWBPBQgtKVzSBVW373QzBffkQ5phl4KMqLDemHVD+RKyGymuTFj1d3tJbNN8BFt5kuGPBahdtmqIZmA84SoN9yf3fu1+vUUFl0xV3MnMvqCNNO7MW3rQaCFaY+8QvG8ZDkAlUZL+XOD2y+hT91qXHXIkbhqZ7oqbK+T8v54qrqY0Ih64t9G0s06pBuiU4oCh7kOKgMxQAoABHYI3SZM16fo1JG1xqoyswFXDkFKw4D3vLjPGTiwVTMd5aDf23Wn9qgGPMcfzXpHnUvjTStbxcJkQOu7jvGBzVlBcnzmCFQ45dWJJB/vYmAvpDotgwDidQEt8KT+iaj3GZU9WCw0Ozl9WuxqwB1iTpnScsSEU7dDNGr4uT1lI5O9AHTc1KJqdEApUcj4h4GhEGw7ovPFbJMgXNl3XrWNYeNlXFXVMCEe6vWKGlQdaa/8wceEMZaIc8OdFJCrk3RbfF7zBDMZ+zizXIiaEIKQa4ocKfMQQUw+A7MLKMhiGct/MF3LHZi/aOVBxZSqwY0x1OzRpkbLFrgl1nD/32gypdV4RtAJPpDhJbLXQbF0rhrxKCe55iuYw13o6UkvPBtV18ptxLAPvVRMgB4rCT3iCDjcmwY2yRP7iASzH7S7oszQo7m7c9108qXWfXICV2mFnzC5k0wBnjjul4J7XYIV/vupLfgiE50FxFNISOtEhAFZk2dBbn1v339eDn3u+b5667kHmtdk/MW8W3vRX4P6F6/WsUdstHPzA= X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZSepZBhaf3mM/FAfBa6Oiilndzs5vuYkPCcFJ/n0IIchl4Rg5W6F/bKC1Y0S/6lZuCrCeoDnfOR38T4mV1ooRoG1/dg6yCB5BbA7fSKrjR2JdCQzjODjuOn6O7QiRaXxksPYDYFx6INMF1X0bJJeF9HP9o7HL4AlYA0tVWKdjwiBCTxo7wVcI69fK8/caMbvjYU9yY3+KuITHBg6AQGx1IG11GHP0wxw/JS1uGZQYREEZWZEoumsmuUiDNZN4aBefZqE3p22xVNTbD+l2y/75XwkTNOXxbCD7JbzZvz/Rx/eZhmU9XRf8+coUfbRNEsnKazpcQ17hNAUGMuS/yOYFrEQt4Y1p+ZG4Ygu7w4lAGNFAqetId4eHfGqcSk9VJ3tgJMlnH/PWspNykKnTgR3pXEq4KcviRkaEei2YxQrYPpmKzK9a8vCE+FZ8tjDttRvehdKHp6E8fSW/kJAeg1IyDrdPZ/kCmk1OtxB/9YthZhWF+RRjQh8sNMrRKFSMF5C5MJvZVyrlKSXGSpmCuDGKTLAFistiWfzVtfMrzXxTgpTEubU95nEr35gqs6f8aV90otzN2kGiDe/wLOmTCRGg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ums+c/BkZWXW0/h45//6Qidn0fssEJjAHUgN6dLt+5ZohdIr8c2a8HUEm1yRJTnX/L2RLE6oQKEP10cA1ZC+Tjx/VHwLetIUyEaCdIyNPrVPpwoOfbSL678DaGZehjZiJH6IdJVItmb2tl5B5vT5Us+EPfCi3HX8bqKYExaaVrdRbtzpOEMEBZEMUrf8eABNcsjQ0cMZo5mRvtPrfYtRd4GAs65pSnCkAKY4bLgQjcHTFkyNPmc6+ZD5mB246GNKl3+4BtXfPymAcJvkx3x7ol/7bIrE3etkvtmI2EKrsKuITZWaggEN3UusgxrNlkSjf5P2BGW+VpFDpt6odHOrZMXTqh0g96KVvLQlrRYZ3t+NwHxW+d18su7TsCzYE9YscZWyqxVKKPPvK8sYf1QOzoGG3pKB/JkZTwLhx5IOY6TAwoJ1iHT0jcjwP3iFVbB0oYvfx2MlhSqweBCBmWchXK0vKusy9XQlQy6BUPDV7EtTMluVLbx6Fwvcm4JzebcsRIdwchNv1vk1MAJtoWZ1eMyHt1e/sRoajqegzCeF7Wxp6xLVixb5SlUQ+p/rKIemcYqqlBclQtrgj9BmeSvOS+xJ9DakWrqKHd/wWLjwXzusrbnocON5tsHDbA+tLV+Ddz7+od9Zl42kDa97+fDqifjYr4IlJEmEHN2fd+0PJ60jBEnfktm/NmOUpKUkyc3YwRFyiET7B8Ba2r3ODGSWufazgmGOI9mU7M7h5T2Pl75YoHOZZo4yWFm7pNlLJMQNTBtPbMU/99rHdAwzG3iu/daTg6wD4fD1pj3nRy+DY636AkrBXdVqAB6VVA3I3fIFaFKv2A7AQ6OIvKNyGOkJYMMr3GcLKUagvNIR5UjWbzQFrE/y7B7eooYOShixLE2l16xZ6SFb2PI0n/IXuylWacB7R5xuvHknYWuENU9upxzbmvjN48D2n9MxBFbA1ePNG9P53WD+RoXYwYH1zeK/bw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cbf06cf-7c1a-49cb-8906-08d9df75844f 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:10:07.5495 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 15/18] avcodec/h264*: Remove unnecessary h264_mvpred.h inclusions 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: OO89ygPk/dPT This is only needed by h264_cabac.c and h264_cavlc.c. Also fix up the other headers while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_picture.c | 9 --------- libavcodec/h264_slice.c | 3 +-- libavcodec/h264dec.c | 9 --------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index adf8a32378..dcd5874c2e 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -26,19 +26,10 @@ */ #include "libavutil/avassert.h" -#include "libavutil/imgutils.h" -#include "internal.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264dec.h" -#include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" -#include "mathops.h" #include "mpegutils.h" -#include "rectangle.h" #include "thread.h" void ff_h264_unref_picture(H264Context *h, H264Picture *pic) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 32df9fd3ae..dc636c5e78 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -27,8 +27,8 @@ #include "libavutil/avassert.h" #include "libavutil/display.h" -#include "libavutil/imgutils.h" #include "libavutil/film_grain_params.h" +#include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" #include "internal.h" @@ -40,7 +40,6 @@ #include "h264dec.h" #include "h264data.h" #include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 3706ae0e31..ed9a74b0c6 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -28,29 +28,20 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/avassert.h" -#include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" -#include "libavutil/stereo3d.h" #include "libavutil/video_enc_params.h" #include "internal.h" -#include "bytestream.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" #include "h264dec.h" #include "h2645_parse.h" #include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "hwconfig.h" -#include "mathops.h" -#include "me_cmp.h" #include "mpegutils.h" #include "profiles.h" #include "rectangle.h" From patchwork Mon Jan 24 20:09:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33829 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16292iov; Mon, 24 Jan 2022 12:12:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwe89x0K9j8d4/9UEaM21qffHukerdTwhbLsX2I5k5CUEmFoENQMtaLrAOzLBH5jPJo42yP X-Received: by 2002:a17:906:1cdb:: with SMTP id i27mr14105328ejh.663.1643055140382; Mon, 24 Jan 2022 12:12:20 -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 go12si8363176ejc.4.2022.01.24.12.12.20; Mon, 24 Jan 2022 12:12:20 -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=FGkARwGe; 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 A678E68B20D; Mon, 24 Jan 2022 22:10:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069028.outbound.protection.outlook.com [40.92.69.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3E9368B1D7 for ; Mon, 24 Jan 2022 22:10:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e8DJ1ca1yp5LlABJ09jz6gg2LPzREaKnhEGBer07T304MT1lYG8senqxkKhFYtDoIX1GdqFZhXDWz77U8AcrSFqLmQB4aDebqgUht7QW2KLwgVe983UwJ45+F0TP1M4PalNLvHTAkfdeD/N21u0ncgUQa7czfA2JhIZqt7qRMyYCpUnvwxVH63Ec53+4ipgpNPBU2Q+de/+PTD8bAiFXq3xwk42NtRnoq8CJ1MQTDsAjaThD0U0jb6hcijdrVqnsAZr10YRGdYYc5W31SwDCCzJyHjlR9f4rs0hlBrnuGM0ok/5b143H9zVr/kdYnhUQLGzdQturFigpGBq1Qa2Dmg== 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=bZYTCGcuntQ42uveoNquzGR4MZS+AdwyZuNQ6QuyzB0=; b=eXAhtOaDqN/oZqd9GPPg5onPg9Vns1R79F3gbef9FqBfFIHB7DyBbj0OUfS4eaDahrubCpZt7/3jPkc3ZReUVf2FcjrZGbn2Wck9GJ7d2pVTGc6BO8+yee6f7D22W/euvfWMZUy4QiNgxBjohXyfILpsDcZc8DQqgqgR6W/f82W010Dnw3CFQ7oXBheuTceuYIGKqUdLctFs7tC/9cV91QH2JOU2cvY2UhXfLLgK0IlnGtumSLTuSBGZZNFSzYrWEgl+iqgZ5vtplb2Jdo3YX3a9t2Wzj9GvnSmgMmEBUc5I8DGuwFmUk05nd27wtJcj/Pyw11HKtOaJxhQPxkLDHw== 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=bZYTCGcuntQ42uveoNquzGR4MZS+AdwyZuNQ6QuyzB0=; b=FGkARwGeptWqYYDfllevv0IFAA0fw/K7YI8rRMsC+D+2vxNQdlD2lGILowLLvEttEk9D4zh0I7w0PxMjdRcjhG5xDJS1q7UWHxIIB1TgRkPwk8WGGNBRaqGpPlFN3ixdkJAQqLWm4atC6dVjRcIttrFfeWUVXskN+kAqghbJBAnS5295RibfRaSqatrhIU8wooOE1eAd9ZQvjZdcIwq3sDI6wGk7dly99vexCU9Rjm3J8KynTfsrT7SUVgMUQCxQEqgacyOuAcxx0gUaAoibEqZ+dvuI0hpTtkgFkq436IUui63jD9WrDfqxLJZDEcpKfgUddT1w1MdytrHGr7qgJw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:08 +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:10:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:29 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [Wih1zddwoUp/at8W/PTm7ppx7xUbopr3] 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-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 455c483b-ba45-4edb-7ff6-08d9df7584e3 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxCf+KnO+W6TqEmVWuiukjo96NAKlKFGA/X5Oqr8FVqeSLsyGW5bEDA5go4c7ZRmmAnHA0JrK45xOGf14Td637spvn1QtYzGb0n32PZ+M+ZYp6Q589/ETAaMyUW7ZdYwhJIbWBGukvr270WCoobGxHvBonT9talmcvJsmLrWitYvNB4HEeeXOSOavIFFsM1BKWgWYPQwTpPvON1eLsVs6lmN3gh1yAMaClIg1to45KAFbjqq+KLaqgVrpRVVa3tG8c33MRrOqv+rBJz+jC6aRI55cFEAV/miK1hAWayAYum4Ww35oXX53O1eA/SEiUUgqBWN0+MaW1jpHRJn0Uetg2wzqwncRTzD4fq6/z6zSAAHMIH08yLyXzLhBgAmz9hYAY8hnprqMpEmsUZjaB7oV3JfqqcZKsvrntpDcZIDGOoIyFcPwzu9If3IdNEJ14QLT5fBsc7Sb1KsreFrw9mIdKISSpaWhdq24Q3MrgXlj6YTjnm6iLeS0NRWgTrhN8khT4agQZDLzIBY4TXs0bCyulLV5L+vX2i7JV0Vi9Lr9dolUtE0Jx1Bhk4TP1kheHe6g2IIrJVJUu3PSrRvE3zvKMSPWiD1ZYTc7CZJ0j5tT2A6PVo1ahXoOxlHH0N50BHvPeTG9Xa1mDqtR9pRj6AzSwSJfR5XcCSLJBWNRmIFRJrzvuxwwhMGiTL93KP4GBFDH6K6NyeailLKmODeckPMJPP72UWBFKFKcWKOKUfoct6fQ= X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b3S/l/nOT++K/eI5+of0QgvzysuqL2gQLppy2QHr3C8bWg+MvoTM3irEF0McEPGaInmFjS8oWUok7jqOHtm0OCt1pn/hjqwVAG8nA5Bn+hzmhaQylbgl8AEcyU07/00BHWZsLVmXoRENJpoLp4iPRwfcoujs1BBtI1xSq4vR+5UlVplBHyoXP/jgUekDSsrj/evyW8TcpYW+Z1Z6KWGgZv8XwwEFenwtAkhj+nYTo85jL3GiFh+cicYOabRgrr/XU+BEtqClRXzSCUTBtlzWhkuKBs3Apwi5UeMYQdwNP8SCjSZJm6tkwvf/m2xM1zJa9UMlbwoGJ+7IvQPALhNPGGE4grM4hmBFR7PPgcvDbd8i9nsF7GRo2FnqSu98T42GigtkTpa7mcXExhPAIqEzvvhUTwehttAuOpFZ+uRTwLz2WQltMhJh7U6YP8PYdtqkvodq39Mr0XXKzNDauMq5Owi0pxD+2IGcK5b7LTcSPNvBGLeAb1lXwUweoIUopVJiBZg7uzouNJ7H1hg/SoFK4vy9ehcEieUXnV/lW2HC666tlXejgfeysHLrrfjNbFx0qWXLDLyIcf5ntBvxEjk9Iw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7Dwedg/g5zNxdnDJZHXbX4dlu3/j1TBwl30mRo2zpNM+WWD9/PzZEZcK1sMQNqNA1E+Epp1sFDVtp19xjZSJsgknQswzm2PWKTAGe7v3odQtdI3y+6U51vH0W8iTHyj6PMrvmPNRj8j21iYbT11ZKOs2Uhrrc07LGO17ZiC23/zKkFRnjPgtc9gSMKRKxeFwtfzz1NTETjmcygeZF0FwE+vMP9NgbBY24FOiKOMYXHwSq4Bgj0NSMO3mmr6eeR94rj4sMtqahHMffEY8OAepFG9ZP7NpNM3/5E8WtPwxCQfCS5gbeRElTANGaTHEMNbzV4lTrpU4BnP9vKdFrsRs/VE2HyES8YghbgEqt5jnISgYwe4KX98axwFcRik4y1Wuksijz9H0EAj4gRS+26zv+qhOHeW9WFWGA9+gcxTaosLVctlgHNn7iYGT3i9DiWevMXMfO4oWthY0OG7y95VchrrDnx1R2JX3LNse7paQw6HaMwl+HkKuRo0C/KHzHm46IB+B0kZtuZ0kxsOKE/HsNeF3n83y2P+Z3G151slO37FYUCtwP9pXAZYq7t3pWImu33BLO2WaDGhwyfeyt2YQlelZZTxrhgMZ2znmpNfu6vxPN0Ev20tnZaNxMROJISiOpGqm8RknGQyMHCTQvIA8T4hAe4drRIgDbWASRuy4u84bXs96Qg/6NvAGtrjz5s01+HErRbhHy1jVowwO9261YLyG9Yth5f4gslzup19mfRHNnQJyNsh+873/F4bD6jdpBXQAgpDJkMLbIXhDKQaQJmwfbEMXb69XheQDg29FxD1Qn1vqDoJ7hmsUNNCZSbiXmJgOJTl4vPXIwpnj2uIJhhQdeq3OGO8jNWOC/2PHA/e/rKQ7u7uK/w20qUKpWio8GGZbipKtI2EyMsoJg+gaDWrIhkoqucNuYV+DaeXfldBcFsNN9XYu42IbYcPruae1XcvEtLkKxSUBSqlxU5BF6Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 455c483b-ba45-4edb-7ff6-08d9df7584e3 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:10:08.5180 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 16/18] avcodec/h264dec: Remove unnecessary headers 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: roa+kCqTRXj7 E.g. the inclusion of parser.h comes from a time when the parser used a H264Context. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264dec.c | 1 + libavcodec/h264dec.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index ed9a74b0c6..a47caa95e8 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -30,6 +30,7 @@ #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" +#include "libavutil/thread.h" #include "libavutil/video_enc_params.h" #include "internal.h" diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index f623d60893..79835e2d09 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -31,7 +31,6 @@ #include "libavutil/buffer.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" -#include "libavutil/thread.h" #include "cabac.h" #include "error_resilience.h" @@ -45,8 +44,6 @@ #include "h264qpel.h" #include "h274.h" #include "mpegutils.h" -#include "parser.h" -#include "qpeldsp.h" #include "rectangle.h" #include "videodsp.h" From patchwork Mon Jan 24 20:09:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16394iov; Mon, 24 Jan 2022 12:12:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGT+0S0uTbLSa6Aoo2T1axKV/XYQol9B9tCO+t5kZA8Cll+ZkrgTPfReoYv4VeNtgOKhsz X-Received: by 2002:a05:6402:5190:: with SMTP id q16mr17606441edd.157.1643055150728; Mon, 24 Jan 2022 12:12:30 -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 n11si8968118eda.99.2022.01.24.12.12.30; Mon, 24 Jan 2022 12:12:30 -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=TXA8ZIAV; 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 9455168B214; Mon, 24 Jan 2022 22:10:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069053.outbound.protection.outlook.com [40.92.69.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24C0E68B1CB for ; Mon, 24 Jan 2022 22:10:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EXusySMcB+MVjAqrEkAQqA5ZuqEuiC23KJruU07TqwrQfbjOTQIoByxDnzugYhOYRIV0t01hRpUjhP0lqZVv2rEE6xZTV+xAkzPYYg/mWGNMPEZsuT4UHtsTXgEUhwudCTdXkejFvdcVCFYbydbBvmp8rC/QhhMfJVNaDXikjH352JFPmnFrmmNYhmgPiBjtWOmF4m7cgcToo1pqQIqtPgOCK/UNUUWoYVytG8snYXKjbNyxIZ8WqaoGfzawKPC5nzyAXfsF8HZW3xrWia5bnOmtWrPcDfNJVcHkeXoLQpx27zjsXXp1sStrYEB0pMQsqn9zLEcVLbU0msM0gTb+3Q== 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=uuB5Oe6Y2dCxV+ZApeYG6gFsTxH+3VigyTnpI/1dbIo=; b=HpDu98+RlUGr1YbGQ7bjKNC6sUbYTATXCgeQ73Oml5Ggci34CqWcqMnwvq0jdxRM/OjgeldzmlLDFFKlPYRwqiWucUwdGhoxj1V0tI7jFt/3DXhJbR43pn9gQPRJ2HnQcZgFcjru4j8arsfoSlO0+P7ob4rL/e9/q4WTdXGqmpfd7JjV5aCQmclkNxk2tHpP+JyATdWDyk+FIxbp71EpOzUnamhrhQ3SVTj8DkbPD499M9e1IjcDb13Z5EUcEckFy1xSmxpg9QvdQEymDkLzSV/yDqH5ZSCTxQqYK2ONfDPxwdBjgg+77gGy6h6XaXtonax6YKSqTsspTwY9+pkFiQ== 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=uuB5Oe6Y2dCxV+ZApeYG6gFsTxH+3VigyTnpI/1dbIo=; b=TXA8ZIAVwHZogNmUQ4dSSU5ArjBQWYVuc8tbQ1tQkmG00CqfjJp8NL/VpjPQmiSOVecnhcjqjnIIwric5Sc1lYTC9QYmw6HiGDfSr7hrwbP5w/9/+L7x9fRiEkVWh+FAsTU9fdnteUUzoQTS/cvmxwG9CRhAkIUTpRTzWG6bfY3Id7qqk+vjehuUr2hbrLy/aAVNQYgdnnjkyggRtLoaCP8F/U4H5lVp3XHW6MHoc/07FKQFJzcBSD+CHG5EDC/5HKD60GrwdmvW8+ansCahObEEWVK9wTuFTtsjLnshz/dpV63i2lXibSXLL010rmQRrlaGPoNs5G1jHXOlsUGzpg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:10 +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:10:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:30 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [z6a6F5v1yImh2pXD5b/AE1G4J4RUdAnp] 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-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47712f38-a9b8-41b0-68db-08d9df758631 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxsfp6m0uSpQM1UXlX/DDSKrvjqSouaV3XSMy5Ooi8UPtWoO/QO1gwtTYgAp/Jr2RaWo1YsQgiKrJOHD7Sp2jUISlQoDq4Pxjq2xXbkG3sgimyqo1+iw892rbhNgPWhvdv5/YWuDb8cMkKK9vIhLPtez3h8t/KQVVA4QFh4nWUFIDDauPouc6MJgcjxDHxa6g3McGyMDh78x6tokvEVh97XDUmXorTMmTRJTID4UeLoPN6Xa51kGSinAE7EoC2id3ecJbR+TuXhhYU+VcSKKdQ6uQVsHgR34VLtmHoDqp8qci6U3vnFdd9FPGq9Q1CeCdhyqZBvjRxd+4rXa8AjVahRFI9Z87pnyDmw9KF2WV+ry0di86vpb1khbQ2xrmU5glRS37LqcUA+xxNva6ssSknj9XI3mwVET7SMQubLn8rjWM1HnHddT59m40IGYBOrpXXowry6svpM2ETmRBj6a1DgHVfDfabFUPKqsvgNoiu8tT9wh1kmJPP55svGeBANICsBENJ8l0DY+QTFzi6Y5qU27slYNWBEjFwO5GDgV5Z18Qa7GsNWDnFRGJuWNk7JPeL6oNDaV3WmzM3l1JaIUlHhqBD9b3RkH8qWSeZkVQ5/2AYfC/JqfVCVEgls0SQYPex7LRxv6BZJ/oXfLPpsTERiciweGP1M1Qj+tB0amu86nV/FbuMS5HQb6PbbxG9u6AIQPsm4QfG94jiR52fc6YflK+oJwPrv+GkOwg7DgL7q2w= X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 42Y78zxz1t4PyZlsqtSijSw3RiTPpeKYQNayG5L4SlNF8h0WUuat3WKLiOJrb7eq+6/ArGKCwXixGi1bfWxhyD+gz7rizPE+rxcIiab2hKFcdZRK4veZLfe+IBcOvIC0riMuS61i6LUi0B0iR5Afr5QlgzO6Nhsbps3wwQNeyZ2RERWlJldqD64aRdnUzPfgrXNQqe4T//7EoxH0zp9MR8fmXCL/55qxmSe7EuC6HZaA2Z5iVP+HqtlOmKbjHNFNX1SLiO5hhmk5jNIlD/rBbHnUWt6uOMnjuL0wEoGyBr8wTCY99TYfmI3DS8q6Tjtlbs3Xp98nwFegtcCjQxlt7upSuRegZGtoJnToUemTcOL5sr9VMGoxXe4FVCMtyIR85xnLFhTIwfpN6uIyPBHb9sP7vFYS5dLGg4vOUHCto859S5b3smlqzC4OP4x9WvajwHW18aad8rNKC91u/OrFwiYHSvzOn/p6HPk8bKYdOATfCGW834TKJ7zDuw5SZJ9zCFmzz6ogSeznJG0FtLBui5EqiXTuKL+w57a/rIuKnOxPY9iOFpb0ZAxSoCI/A/a5/hZFcW4ysysJfxszJFuxkA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EYrtRhm6b79WFjkBM36NmyYqH5zEJt5vOv0rKnQ4C8GXX8SqlxB4g1PcTDL2YHjtbfqlmuMXe9jgFokZ102BBdT5B8YUQ+VvdEsr0bZz+RwsSzqhXv5DQUfO8bF+m7v6nLBiZnrDLh7LIbPA6FkZayWfN8/oVwqZgH+t2Ht03UfqyKlA35LWJ8R2nM+X1842rxhspDaT4UrATchNOOzBu8nueKm8HFOSEZfGei+Uhpv03WKkWBoQa+QTt83L8VOkltKCwEnSdXRzjp/6PiywbyIAsDFRLtYGk9H3bEutYiGIUkvLTgmqZiH1OMvTQrafrZ6HkyoeVUbmD52kslwdnCz42XGq23H+RJDmM+duGa7FZKtj6EjyIiaMuC7urVB/9IhVjRLcRsq7aFdjEfMSOjglcX9WNobt78x9JDKmDGSOdRpxFpWkq6trq9lmhNdLjeLobbGOHs+DY8jD82Fgd6Y66oZIHH3hSoafXxcuEHiyQ8RbcZrxzwRXJBJyS25DqLkRkbjTNhnxl/f5JLkDQlfMgdmqKPcp0DzsLw81XthJrU+aN2qJaPdvGucYn+QRWHu9o7EBW99fAY2qiSOgwGTbf9hwv/q9RdaPeqSYGLTAwRWNbVctHsuuRcCxdYXkbblUKHD2as8EpKg/3ml2KIXQvM/S2NSg9TAmgCscI8FWl+bM8G8y0HlsxkuwXyqi3e0/ghCqDO0et3u8zOUj7V/lQqnR5cqEp2GcwQiQ6fGG6Y/NrBBlr7EZNCFHZw0+Fde/JeqHYhCy3mxNnORHPXa6bDfU+tZV1695ptsBwgdz5bNgWJMbtgQeylKh6upjbQfQaP5wgTXpaXz3PHnzOYjYvdshNbW5pGdSlMwR0OZV6Ld3kYzHcp5qAkp2p+Fljf694+O/HPu3TtM9eGwQbZ4Xb2MvFqTfdRhEee9qSD+3GwwyUI5iVP/truf3tuDTE1LknTcnetQkKIXKLJw3PA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47712f38-a9b8-41b0-68db-08d9df758631 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:10:10.7063 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 17/18] avcodec/h264_*: Remove unnecessary internal.h inclusions 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: v25w/HDhVvIq Also remove some other unnecessary headers while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_cabac.c | 1 - libavcodec/h264_cavlc.c | 1 - libavcodec/h264_direct.c | 1 - libavcodec/h264_loopfilter.c | 3 --- libavcodec/h264_mvpred.h | 2 -- 5 files changed, 8 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 884d392022..703b27aa96 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -34,7 +34,6 @@ #include "config.h" #include "cabac.h" #include "cabac_functions.h" -#include "internal.h" #include "h264dec.h" #include "h264data.h" #include "h264_mvpred.h" diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index fa8ba5dac7..9191df0303 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -28,7 +28,6 @@ #define CABAC(h) 0 #define UNCHECKED_BITSTREAM_READER 1 -#include "internal.h" #include "h264dec.h" #include "h264_mvpred.h" #include "h264data.h" diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 8f07981130..93c2e1e438 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -25,7 +25,6 @@ * @author Michael Niedermayer */ -#include "internal.h" #include "avcodec.h" #include "h264dec.h" #include "h264_ps.h" diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c index 558ec6c02d..2440cfa831 100644 --- a/libavcodec/h264_loopfilter.c +++ b/libavcodec/h264_loopfilter.c @@ -28,13 +28,10 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem_internal.h" -#include "internal.h" #include "avcodec.h" #include "h264dec.h" #include "h264_ps.h" -#include "mathops.h" #include "mpegutils.h" -#include "rectangle.h" /* Deblocking filter (p153) */ static const uint8_t alpha_table[52*3] = { diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 19d9ee462d..46ae2738f9 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -28,8 +28,6 @@ #ifndef AVCODEC_H264_MVPRED_H #define AVCODEC_H264_MVPRED_H -#include "internal.h" -#include "avcodec.h" #include "h264dec.h" #include "mpegutils.h" #include "libavutil/avassert.h" From patchwork Mon Jan 24 20:09:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16506iov; Mon, 24 Jan 2022 12:12:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3MNgUrtn21FV3REIA2EkWJRieFZeDIvNqWCewIN0zSCOmab7XWbcPjYYHEVB826V0+3u3 X-Received: by 2002:a05:6402:4cf:: with SMTP id n15mr10909350edw.165.1643055161561; Mon, 24 Jan 2022 12:12:41 -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 qk44si2566924ejc.231.2022.01.24.12.12.41; Mon, 24 Jan 2022 12:12:41 -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=JKjMcSHX; 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 8987968B200; Mon, 24 Jan 2022 22:10:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069094.outbound.protection.outlook.com [40.92.69.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7AE968B1F7 for ; Mon, 24 Jan 2022 22:10:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KjoBPTW0hvPI2XNqt3McHW02oL+JVTwAK3gvblqk+sbDkP0/KYWtNJTw/R2yM8ZoHndaL9Su7Xcv2IEeWyKIyR9ief5/QGbeVSiuG292q2THvQ8h4MQmgGb3/rgvOSQfy52jrubjET2+Hr16EWiIu9KOhiFbfXRKwMpGzrz52fbRSDeugzrFYuOrMKTX0FSFBh2M0aWBDT0GIshahnKbv/Z/bniIq5Ik8ImeKNU93lY4aebXXZiQjPelwtAYHcaeLHrra0pbAU7IyEvKWAggew5Sbr9+Ww1F1dIcgTeIrGdyDxB7k6zr757j4qyPjhokIZsLPaaUDvzSrSGEWlv/tg== 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=hRq/CDsIJDlsPwsZTanJV9F2gLDvESsb0wnoHugAtoA=; b=f85R72noUOlbY7o5F7PzrE+oKu7k87OPtCjIztCg0U3BW3+tyQKPzUTb6XxxQmWhtVOqV3pzclfwvwDqnSEQx6/rkuN6ZZcDavCps1pCwI8aUL4JIEbsSvcGrgvpS5nkDOwBaZelPCQwrYZdFub6Zgm/eCAJjtE699DO5MITSGxhsoeZgW6C8HlhHyLIvk4mLpaBcaeD/ncXGLMG68bX7d6wGLiEuDitJjxYbKyKVohY3FL63c2IW7NU2J/Xr4W6RuMhEFP3zdLbJ3dfOJxD4roF/NI6TJKbh0ISpyvXcOMc5iOMkuS65RNpjgzIlaEY4bPzpcEUsT6H4viNdYUBHA== 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=hRq/CDsIJDlsPwsZTanJV9F2gLDvESsb0wnoHugAtoA=; b=JKjMcSHX/NFl0dl2iTK4JjHq1ocgKAoWzNNjHsiY+0Ug+NwM/f8v2UVWQyu+aLUpnVY8zks+//N3DU/0qA2+LA3tVUAzqP5gRnitcdEQ/5A50QnkC3tYmyc6UZ0OPdtV+aSa3HSEiViJUkoAxiTtSWOjb/VrARKFp67/OdZl28zoi6APStRwsKhIoex5gZaveIhjgyVx4w4xsupKI+cgom+/SFWeL+J5SgGk/UfUdsA/EejE6BmVRpJ94BBax+7fmnY7cj+nuOOrIxAVCkaQ0TV15qeW1DiNfR47JL2Xh/7xgF0/JmZbNTDnNjh52PbEDl/5t6uBSyRwo4nf6CQVYA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) 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:10:12 +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:10:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:31 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [VJHAQ7RqUtbuuCLTunLsOT81VmBKErjM] 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-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6baf330b-f821-418b-a509-08d9df75872b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXG2AS1I1R/T45K/68k5ZmOvPEnanSr+QfI7AOawvfGmAiPsdG3f1vP2qmn9+FR3a/kHZLuUc/iXcc4HcqrfMVz7/K/tJ4f+wLeF0xInYpBA7UU27ty5cIVpQ/v6qSpiG8shbSxwYwLBiicXCDzYt+1hRAl5p2b1bfaOsfNQb86vvm2gYr4fgfvE1Z++uTGLDDOfTXDLzWhKMP2k0Y24v+8LKoeP09nbmBGnTeP6hlW7Au8UGqDIcYhWnLG6E+LbW+vJLqpWeu+PHyihN0e3sVhFEPzDbDONoB4a3fNgWJlaONYU6kHbeKXfmNxgN7emGBJvZdMYuSMasHwk1QTIaMlCYodN+ekFfUY6uIb0qDL1U4DEHI+jFWwID7neNCTYBE+F/HLl2Vg9H/20YLiXhNq2sR+Hd3ko+K1FUB0algCJvWmym9iOmCjuziKqilX4W3G+vUQxq1g0mupF7iTculHKkpHjjyXiwNcIllKIG9rnmAeuAeAU9yhKj4pkxoGwSyrQaxA87ehZSFICTX9Ar8arfZkQcbN3SR146AwM/2wOB8r/gXRx/Are6Hs/U7evqdCjvTOBfXQC79HQz71ehxGfPL1umiv/kihEhoWuHCkXpCF/7TVKxE/M241kZv1GrQaIHhI2P6hPVR2GsfxTOzGYV7L7koSs3SP7S1LFXVt1INn7CmOmg/dH2jdTCyT80vE+T5Zau7xJVo3TT1ZjL0rumaVp7AxtOc= X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jrBCPSl6DZ+GIp2Me+6yd9jBsVIR72PH47oaHZG8yrACEy4/7YytpafHb5qGnCQOT2LHCo8xESMAFOVmkDBE8D753EbP+oWesNjR+ZTP53Hd6JijgvBVMrn3b4pgqTKX27LT/ETZquWeLyjwhH1EVR6ima9vitXXm8Eefb+M1aBpZ3fLgJ07JNSHckwHumJxXSzYwOdrr/UujeZ0TT+ju2TG83sMe/0HwIXsklGroQRJqw7f9SWK9+aXK8zizWZ8cs2BthFZSBtuTtfbs4UrJA0K204XPe5wtJaNKeCIzntSiwzpabJe/PiwAE/6D96mrdE8Goai8KMhPckbu7+01LQm5ldobBcTm5c5L8YP95/l5gDaODMf2qIIOJbjMi0a16aaEDYx1ndygnMJmk1pyjq44MlITAIJctkIrnAU5mCkKNqR9mWJjocqA3Rtc4T4WwT8IKNWJxutQk4Zf5InbKlSdoGH4Vir074fC20dubB2PU0w3Kq0DwlmZdycJV6unXsCeaR1SIBTO0Z/rYSymJXe9gjpG/w/CvT7UlBstv0GnCYcmyggAoEw4JEjmvQwRxZ32AQcF2HbEYlBiwcygw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OFkBcqS+klxSoUccDEB/6Mmy+5uCqPk6rUUfwghNCDyg5GtfJHOUUyMnexi+Je51CIAjJybAjaUEKELioa/IihIxaLjG/BJToOez2i4XKoOkPRXD0DdeDzs+KCQU1Vw8ERnwpTlG2icb2tSgPU/W98zWrh2PZeD5oz3bqg/cN4wUGQhwA0jWqBM44Zhugsb9gxcwpag2cqvmbHxKXuCkG95fSommBveIaiP5aO7ytfx9/jfncq5YfhrBqlmeCHA01n3h8+3uylKffjJBU7VnEm31HwJu2JwG0mHGGu/PI9bYlsnDJNCZIRbaDCdrvshNQ7yKRIBskZj3lTDOLdPN2znzFjRI/N1BiDv3REWV5P4HFJjSBubcPVDhZYdRCxq1qzgCyKjXY+DhOnZx9KEMCOj9JxNlVnfyjYjDTAANRH6OnZwtUlaNZ5J2SHYwZGQBVsGDMh8bhQs9xzGfKlQ3JQh9Ljvh+OxR327oaNy0fcyhX+NZpje0muvmOkDF5NxhWLRxvxwSkHir+R3aNvScKojZ0ixoLkdGT2W/dY5nJPyE8pJ2Qy5PQpaPZZviYuga/D1Qe2RYxDi1w+SjsBmwufa6Ak8vBvSmyhrPAtNyjszOlbZoGT5jB+ajak0BoVr1iJPUvM2ubw5FuNalTxK2Ydzte+XhUzzNmJuJw6YFNbH+GGn/3xr0b0NgGPuU7g+AIhGGNQOSPgm4Bo1C5ZkJC8V04CyM8lXGX5KNwPYCuw1P9aymuJV89PlCF2tFS2Sc+zfIic521hjwi0WNO3scvXFekZHfObPkZ9NqVHRayL3MAlntenorX0MRIcSdgmacxK3EKjrMOmKbw0dCdLL0MXDSg7YVrzaev42UEVX2JkhnGV89gg5y0fXFn0unV23OcIXgL6tBA8F0q0/zmLbnYqf877sV4YfSXDlZqj/BKUqksUp61WcFcyFYjWpcxyUHXXHde6uCfVUVfxXumzgotw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6baf330b-f821-418b-a509-08d9df75872b 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:10:12.3618 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 18/18] avcodec/h264_parse: Move ff_h264_get_profile() to h264_ps.h 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: 9WYW5VtaEehE It is a more fitting place for it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_parse.h | 5 ----- libavcodec/h264_ps.h | 5 +++++ libavcodec/mediacodecdec.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h index 201d983952..4ee863df66 100644 --- a/libavcodec/h264_parse.h +++ b/libavcodec/h264_parse.h @@ -124,11 +124,6 @@ int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps, int *is_avc, int *nal_length_size, int err_recognition, void *logctx); -/** - * compute profile from sps - */ -int ff_h264_get_profile(const SPS *sps); - static av_always_inline uint32_t pack16to32(unsigned a, unsigned b) { #if HAVE_BIGENDIAN diff --git a/libavcodec/h264_ps.h b/libavcodec/h264_ps.h index 3f1ab72e38..dc52835ed4 100644 --- a/libavcodec/h264_ps.h +++ b/libavcodec/h264_ps.h @@ -152,6 +152,11 @@ typedef struct H264ParamSets { int overread_warning_printed[2]; } H264ParamSets; +/** + * compute profile from sps + */ +int ff_h264_get_profile(const SPS *sps); + /** * Decode SPS */ diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 04d5026e68..e8af00ec00 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -33,6 +33,7 @@ #include "avcodec.h" #include "decode.h" #include "h264_parse.h" +#include "h264_ps.h" #include "hevc_parse.h" #include "hwconfig.h" #include "internal.h"