From patchwork Mon Sep 6 12:42:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722264iov; Mon, 6 Sep 2021 05:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVfv9KEBbKeZnr8lS0H+XvjXSE+UkUBiW5p0ZKt8s2hcA2DIUv6fCj4Cc5ghpMaaRBs3Rf X-Received: by 2002:a17:906:bcd7:: with SMTP id lw23mr13605870ejb.141.1630932262984; Mon, 06 Sep 2021 05:44:22 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g3si8059832edw.18.2021.09.06.05.44.22; Mon, 06 Sep 2021 05:44:22 -0700 (PDT) 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=jDeX9+tQ; 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 2FA0F68A60C; Mon, 6 Sep 2021 15:43:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CE4368A62A for ; Mon, 6 Sep 2021 15:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O6gbZGrZ8x9zpahu2hT8xFnol3kdMP+h87DHvDLvc70726LqcHoe9Kn6pUVF7JwKCECLm8T0c+Zo/RL/KXg5GsF9L09mSuUvifUBnHjrhHbQgJBS7f/M8xxtL0exzznoOXi1WLLgS0TvewKUVx1yXZfWoAOiclq5nxVYSaUbmGHYiJfI9dIFfcelKT/jNUDF0sVXuetOgq76n49fZy1ddM67ddCafCr8JYAPawJQ+G750fvokLucm/1/wPLdUg9KxnAbAgxumFmv/gMoDqMU0mamIKk7df7H0XeozyXRsgl5eBrMWIu2yk6gickocqPOoYNKPAVT8Q9aAC1bk3XraA== 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; bh=59B35eFVw3PqQ0LPDtvwO7sKqEQMpEPwuXgqgY09kyU=; b=ZVUxxwnKNl1EMkoV2osbo1fhcS8r5oigheFKKJVP64r6E2/rqjh+EH3DkLHhOLx6jHx61u3piAn/8snPm8y8BdlZYuIvjfqWwaUtMzcuEjHe7l0r+6nTaRNHVrXkR0yUYIerhIJ3J6W/G81Zet8+VBlwnkCNMTCgJEAStgcffEMyaExNLIk/+JriOqqurqhdf/NdVktoUJDh7P2zdnvzQMcnBNUCtyDZgS1NHEnYx6Uzdp2gGUCF5tmW4OQPEUhHQa6hdx2fPYNKYLPcEhHHrU+9RXqlcfvrFLJcGr+gMOAVo4RwGHbNKmihC5r8U/IQtBcOCvlrELtv3DcaGni1PA== 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=59B35eFVw3PqQ0LPDtvwO7sKqEQMpEPwuXgqgY09kyU=; b=jDeX9+tQ+PJzfB5S7olBEUWB0RRLqdldTuyyeZ1HPwExnvvvg1dpNyO1kZK34WAPKb12FH7HAFMlchOEG4ndarLI6L/CXQXwj6RdR2kr7nFQpOL69egcYGgd9zplLGkzzupokKco+5Y9l1UkZjYodvGn1TX4QlW58GgSgiNIS7rJ+axSNnE57sUEM/pK7haasjUkXzb91uxeQXp1Gq4GBXy3pHSPbPSKuI3JeUTCFD0rCvwc+1YhKOvreM1Ace+xCipYX0P+kUXcGSbWruH6ZR7MiFb3Mz01Bk+s4+R1G04pmyJ67AKnrXjEPpaox1SCdFTOZxmJeAO+7i/Etu9h0Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 12:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [eCf4ieppO8Xnlvq7WtDdmS7UeU4Y6/rC] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2e2dc77-dfd9-43ea-a647-08d97133e798 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pEvDpszNW6UIgfSe5KBkyHfpqUPk6b/HOGYV8ByhPEz7PVFGKKGEPnYHfB3oFBgtAkDOdkS7RAnjNYu8HZxCNZ/MEC5DLvywnubjgsASoe8fah3rpWCrgNaPu9c2WpweXAPnQ8cGR0fhGIroxxVXstAVvBX3Ca9PGsASU0JOyPf1/Ltaz9lhJpjkEmltSLHwzaGVYidNRHymHsmI8WS0+MB6QiIvw3BpVp2D8vhHTTpZOKllrS7fR/aPww9z/wnmNqqvI1gsNMiRDCrPTJ2TQaPq/3JN4IKIzTOAPP2JVZf/i8C3U4dQE7BFhsCUppF5FEiW5Hr/8LUOkYTLFDcpD3A+zkVynthoYXhfZ4rYvsGTuIWUqXL4lf+HXYqkYRKxAC9PyOySSXpavvp/gewT+fjycrVAiaf2+MEDrHM4bzNA/fTLO+FnuRsW2c+pF+WYoU7vEtvV1YUjNwQnoTDIFYP6yLAyUHJkr7PVlJPXh4PNCszQXZFpYqw3PL9TZiJWu7TGZgd8YP+VcB6fIQbeW58W1+qwK9xYiTixeJePnMJI+eL4fn8l/MGinDUBFHIf9elnU5/2UGYbRGnUsvNuUNlaB0FImWAcQi6fBZAS6nZuSGWL59vRCyAXQr69ESx3JWenYrJ44+2/RfUnQzI9gjVD2bW3v8N0SResW+ckbdpeOjyTJSFP5wjw== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /S1y2hTmtrGF9dMcj0hoYHU7Dy7O7vKpL3FwGs9lEilK3wiOQKY5pYk8i+VAltMnZTQGrGoWfb2ZFtczFZrKXtaPzT32Imfs1jDp90OMKycg1VBIh9NDdZOu8G0hDwnsyyAKCysZKUC7C80d7ZfuUKGhAnLzxI6+mM/G0TFyuJ0K7+VoLMRvCipmja+1wkmcZrkl7ba7hN/KOHFFGwUzbHdoh1afSyXMnGEFUIoIegmNa9HwusD6JUqACIcpqOCOXYTdFF8E7b/7UH3o2irrKlHAx6PxWxiu8gWVmPDgZH1rHimaUqpnyCttQW98JK2ByoGKNv60/+J/ZjJKGdIib9xBrZPiQr0iHR38EBTO4CHWAnSJbma6feEJxBYnDYzZ4OsC2n7TGsTtALCiYwdQ/RXhbRFEx80R1LHGdNWGeWGITHDKazT1PK3F2Df5iX0Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kBJWnaGXBrjlfge0xDkF/bymf3fbRAwNJRiG1cPedd3ZjTjEA0x7sHw1g1KENbcEiPpdnvabjfDXHwk/tNB5atuN5OAMXNH3ud53b42KhG6WDaceW2G60BqobziJeTFmdhFPGN53jmk7jGh7KyD9Tw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2e2dc77-dfd9-43ea-a647-08d97133e798 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:19.4637 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 09/11] avformat/mov_chan: Make ff_mov_get_channel_layout() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WggtTtWXBWhy Possible since 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204. Signed-off-by: Andreas Rheinhardt --- libavformat/mov_chan.c | 11 +++++++++-- libavformat/mov_chan.h | 9 --------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 4ec16f15c2..349634094c 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -451,7 +451,14 @@ static const struct { { AV_CODEC_ID_NONE, NULL }, }; -uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap) +/** + * Get the channel layout for the specified channel layout tag. + * + * @param[in] tag channel layout tag + * @param[out] bitmap channel bitmap (only used if needed) + * @return channel layout + */ +static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) { int i, channels; const struct MovChannelLayoutMap *layout_map; @@ -591,7 +598,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, if (label_mask) st->codecpar->channel_layout = label_mask; } else - st->codecpar->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap); + st->codecpar->channel_layout = mov_get_channel_layout(layout_tag, bitmap); avio_skip(pb, size - 12); return 0; diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 978b8a3732..f7916e9899 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -31,15 +31,6 @@ #include "libavcodec/codec_id.h" #include "avformat.h" -/** - * Get the channel layout for the specified channel layout tag. - * - * @param[in] tag channel layout tag - * @param[out] bitmap channel bitmap (only used if needed) - * @return channel layout - */ -uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap); - /** * Get the channel layout tag for the specified codec id and channel layout. * If the layout tag was not found, use a channel bitmap if possible.