From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 59B4C4A2DA for ; Tue, 26 Mar 2024 05:28:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AB5D68D544; Tue, 26 Mar 2024 07:28:12 +0200 (EET) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2036.outbound.protection.outlook.com [40.92.48.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8A9568D531 for ; Tue, 26 Mar 2024 07:28:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=COdLt+HxiMeHK5uXVHFNxrwtgX8V1qcg6+e1RroNAJYl66eZIsptpp3F/w3vMRFh48yc/gObWd2sMZCK2ggtGBGJkk+fHGwc9l1BaM+gw/oajdptY0kb7WjJsoqxcdCKQQ9zimJ+fV/Zujn+0YCqwXVmklXE5j20cz3wSPHj+KE4fXz6awU/dX8hNBbuBcmPtTx5Ue6huCHBg4bvD2Tr5uKyxfHXbI2SbpKNkuurTpDQmt/HYL0WzyKZLhf6N11DHx30pBDOoDda2c2gVD62LFw1D3Sc8Uf8j9IKNX8YUpx1I1wzWHlI9ln9CZ54GuHn8S9ax9+WUq0rRFXzV12O5w== 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=bBitlQmSTPY3d0gNnJi1eRgHUBVPOnaR6GZO6jizCdQ=; b=mVtJDua4lEXTWmKJYGaKlgCGfUmW9F2MEgl6jczrd6LSVZvik6g3kkSoTHj4kqRJmHmWC1urYSJyadr3wuiyEsHLNYWcvCRYKoiWsExHQSHWFYwU10PKRcF1NyGSIKFsUCBBD0X6Eb/1iZOxokSdMopl3nfg0gVL7hDIulUTLoAbea65cC26/wnf1HHeBchfUHfpim+fsdnnY1H2f+dFrVmTQPgEiXJyL3uaMsD7/4rXLaiCQvPKRaFHURElJHBYi52iej2m1xErO8sJDnREFEqyDCvBUAATyRWVJ9V/0ouMvahbrrjcVg+zSgEvWMkZeReQSfM/BRVssVtLO9Hmiw== 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=bBitlQmSTPY3d0gNnJi1eRgHUBVPOnaR6GZO6jizCdQ=; b=T4zye6Mr0GUhHLxV/XVCtugXxeyMI6O4jNVo9gtZQ/FJrE0vGiEWejdWb9SCb4f1KRHOXPwRaVmQQMiFiv44SA+YOBD1hMxnaoRYjM4Z/hmyk1zFiH6zj21gvOjl9t8j2kTlQNavjgnIjNUlqxIauMiECcb3OuRCGqgiwNRG2j3xSKJdbusmXBEvNeBEaOvX69senMaNnm0JTdwODjkPyYEcZqw11bcVyuAMJVHgF78VmBPpDw1UGaSqKdYpbaWWHgydFdqyCJesKgklXkCg5rH7uIdU+cah7kSYCIDWUYkQwojCcPF/UvmAo3wgYRsIYGIDbErQ6IIPXiYyb3Ll2A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0498.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:33c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Tue, 26 Mar 2024 05:28:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Tue, 26 Mar 2024 05:28:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Mar 2024 06:27:51 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [y+xAtByUm+xn3w8R+EnFkH9vCu9Tj75tY2EuLfwgGaA=] X-ClientProxiedBy: ZR0P278CA0216.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240326052751.3580990-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0498:EE_ X-MS-Office365-Filtering-Correlation-Id: 2237e61c-b11b-481c-b6bd-08dc4d5580f6 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3AaPVsKpUK9EsfMEurh+XOVTsBieZuFGGFvxa6DzoJe0C/hH3YlCl6MJDltFLLkEEavgit52yjySmX88QrrNBi5SlBEuD3uqchsclxVC6LHT7U2tDiIolZj3oKqCtRvRg633FS3U0dJEd/A3Bh5qWEOOPQS/lez41DlAkBaFvXW/Ude6s3VXEVOjRziHJ1/c4V0T6M6M2nmeNkbBmSjq1+RMnEsxyMMz7DK12zKTFtnRU57K+s2YaRumR7K2AUGqGmOkX2s127arLwuGG0lwWDcVM0FdXNCU847V7q7RjE8bJYIVsG0X+avg2FzeKvgA2JjkGBQQG4BCJNLAEevC4nS4QFBGUCFpaB0xVdTex21kOYtrDbTgbVw6uiPitGM9e+NgCvSXbnPyTjy0HgfoXzBgLz6YKEZtSsJ5mv41KKd6tUN7Em8ujbejajxHl4hs4JJ6JAYEqzGRk609Xa44t5huJwlNEjg03eEm+DoW0UNLBa8e0JbVYXKW3xLRbkAR6Mf6pfrfNq9FvAKv3zZPtzz7hGLVTNJW+legoQpE8kVwqwgcF+HgTdjJ4FVtVUyymIi6N7S/tNC3FPrspJp9NCT3vO6V1yxlBQjn3fa3ADPtffp3D/eaFraLqbbrghjQmNHRPiedZ+w77a8no7nDtkebMTdr96/oz3222qi6TciBWMgkdozqlflPeT1A8XYg1vf7G3ZRfQ+X8WbhdflYPMMDpcHf57RGstBvaGVxMyEdk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5A7N+zPaEkh82fcwDwWbmzOWwE1TV5ArkZXR8bHLZMujK6WpsX2dVy0GMGYuLh7QKCwhYBMrdJ6o0cC+DMPR2uA1wXoTwprSfjNlhktCLI/VOARNQh385q49Osho29VwhK07W6B95ExDYdo65M42fjBDq/Ih6Tu3SdMRUZbHqKjhV+WxcaAwwXKKJ4H99cWrh+/t75xUexukoXzl/KQk0lODrZcCUZ2YzluoMruzvJ8YQWPN2jLLd3D6EntECk3fYz/wkI1v8WuCOCgy9dHKGkJM7EeuJ59yfFkCI+4zbtdQXcqqsFySkgGvT+qMI0Od/PZLMArlLcOvZ4EzMx23tIbDrW4eGqxG1j0GDlBA42zY2S6YW108+HBEY2wyB8IaRtxJTV3/HNfL8LNs2a7o0Z76ogNhYA2rXSG12vIInY6Um8wnGAxj8nrcMzZoe6IB04C2XJFz2dRi7tOamDL2xvV6MjEtX26kHLh9Mudm3zVozyBhEBIfS9+k3tHrjUJJ9jVDhDX3MtLxsvHCkFrwRYJ4Oed0VsiWjmslsF8jBaabgHi2mm6cUo3yn2e8pCI9jkIdzcAAcaiXzRL9vJl5QgRo3DCyFQu6uRfKCT2JcF6Ha2zkX+9xWRmW09a04PqP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gbi2gQxsZN+/msQnlBEzGjyi5zgCTrLAh/A94jnDWaj0xJLCrQjeqENBWgrB?= =?us-ascii?Q?etobhQ/Mcqh6cPfVXLd8GHvG4U6ZgbH57W91jrOOcfMT3wjhOmEzBqOvtZA4?= =?us-ascii?Q?2EA9+JGFt9H+zE3N0t1epsUOm8FFqZXsrQuT0Im/curZ9ZvZ0H6Bhe9ig3mR?= =?us-ascii?Q?Fs0r/wUzvhfZhBJR5UWQ/rE1u7Jb8sA7tc3ht8p5kBukZ0Cf1Odc2a3wmqkI?= =?us-ascii?Q?Qc0lay/Tkyzcw26z/LSfiuPEE5clbb6FbvS38OJFeSuscoG6v2Q7R9uCsWGH?= =?us-ascii?Q?oOVOhShCtqHwy5EQ+FQIMJ/LbMVywrmNvezbCUA/Yv8tCbge/eNUqk17VUob?= =?us-ascii?Q?P4iszI/PlwRloPd0aCUZ3nuIIuOD3jiCZV0754aVGW7E+vbri7UmeD96vW16?= =?us-ascii?Q?pRqH+GoTyNYCZDttXOvhICSvNs9JLw1fgoJa/tMa7wnO0uKeSEWWxYLayOun?= =?us-ascii?Q?y1uwMruW07329VvZumLKO+xnWoOJnmI8yitPjP1XpB96gy2vz66mFe3+ONAB?= =?us-ascii?Q?dULoduVKBb8aoB6MmjU7AhMUijNzqJHg5HieCg0bvxUyOpL/iG9+gbyzmdMq?= =?us-ascii?Q?t98YHNTPF9Lx7t8pgpZilEQAy2hVh2beuZLaH7mw9TKVJhSbWqr2NY21UwwD?= =?us-ascii?Q?hcDRK4Hmo5Uh7jsSoZ5VyCekOK4nokf5Tv3+uyBRj4u/7cbeGazVOZl4mXZc?= =?us-ascii?Q?LoYCg0WNuwxiCbVp7yODgFLVTMOlu23+2xBwPe/l0RK/RJNrLehVpVb1ORhS?= =?us-ascii?Q?2+lUXbewZx7vccqV8HWV1nUfYb/+svcQbpXr3fWKp4tgYsGhYnUZir00lyHu?= =?us-ascii?Q?nhEpyy6/PbmzS8O99/7LaBPsznxd4lDtUH/RQU4sVsfqoIQD1RnjQwPu+la4?= =?us-ascii?Q?y/vT0jbXR9bia7qXNFSUCaaelhrqUVdj+phiYJdSgkvyuNcoCe98PPewHCR+?= =?us-ascii?Q?6DUjSO6fshUZBwjJpsQUq7T5ErhLyzg6aZC466LecyxTnIVGIEegHL7QfByB?= =?us-ascii?Q?vOiiXqS7QsLksBClG7feAfaZnEctE6YKJzSRx4q/7K+rTC5ThUucGJtg1NZ7?= =?us-ascii?Q?/IZbwIWEMeT/FfUDCILUL6Ua/bfpzMICG/3fmCiJEuJ2SRb8CDoHmKLj4K1l?= =?us-ascii?Q?tHF9mXNcSCBRtAcVwx8dqVQU9CiV4bRgvNTr5FDJVZotNay5808LvVgLfUQj?= =?us-ascii?Q?ubHuCupvhtrz5uYLjszGsb7/EXn7kEcHvkzx0soOb3sXEhSFaO3753JCtHH2?= =?us-ascii?Q?SND7Eb0fbH9SyKgix/vz+bsbk1Q4JN1MIlUBYmCHtQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2237e61c-b11b-481c-b6bd-08dc4d5580f6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2024 05:28:01.2717 (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: DB9P250MB0498 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/hevc_ps: Make ff_hevc_parse_ps static 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It is only used here since its other caller (qsvenc_hevc.c) has been switched to cbs_h265. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevc_ps.c | 14 +++++++------- libavcodec/hevc_ps.h | 13 ------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index cbef3ef4cd..4e2c36b448 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -866,9 +866,9 @@ static int map_pixel_format(AVCodecContext *avctx, HEVCSPS *sps) return 0; } -int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, - int apply_defdispwin, const HEVCVPS * const *vps_list, - AVCodecContext *avctx) +static int hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, + int apply_defdispwin, const HEVCVPS * const *vps_list, + AVCodecContext *avctx) { HEVCWindow *ow; int ret = 0; @@ -879,7 +879,7 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, sps->vps_id = get_bits(gb, 4); - if (vps_list && !vps_list[sps->vps_id]) { + if (!vps_list[sps->vps_id]) { av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n", sps->vps_id); return AVERROR_INVALIDDATA; @@ -1307,9 +1307,9 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, } memcpy(sps->data, gb->buffer, sps->data_size); - ret = ff_hevc_parse_sps(sps, gb, &sps_id, - apply_defdispwin, - ps->vps_list, avctx); + ret = hevc_parse_sps(sps, gb, &sps_id, + apply_defdispwin, + ps->vps_list, avctx); if (ret < 0) { ff_refstruct_unref(&sps); return ret; diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index cc75aeb8d3..82fa5bf820 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -447,19 +447,6 @@ typedef struct HEVCParamSets { const HEVCPPS *pps; } HEVCParamSets; -/** - * Parse the SPS from the bitstream into the provided HEVCSPS struct. - * - * @param sps_id the SPS id will be written here - * @param apply_defdispwin if set 1, the default display window from the VUI - * will be applied to the video dimensions - * @param vps_list if non-NULL, this function will validate that the SPS refers - * to an existing VPS - */ -int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, - int apply_defdispwin, const HEVCVPS * const *vps_list, - AVCodecContext *avctx); - int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps); int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".