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);