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"