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 56272441FE for ; Sun, 2 Oct 2022 16:42:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5596568BBAC; Sun, 2 Oct 2022 19:42:34 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2068.outbound.protection.outlook.com [40.92.59.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAFF568B353 for ; Sun, 2 Oct 2022 19:42:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drwZdT1vPJBKCvS3JHJDIXdNF4K0RrYFPVJSa4c0aZh2nxKzaz+dTF4Z7hKKKXxYuZQgZwILMDOTobrxODxNsOJxIX/ToRQ2PCjmmpOuWrMbGjm6pXxg8ZxiCTUzXWcMlPN2Q8TncI9/3T6RNnM24Vcld/Exmj7KAXIvVdhwy0baUtQ+NycUJohexEQrMFSwfiJIP69tMCx/5Yf/0Q+H5AKPREvT+HG50MxpELj9kiQ9gaBD4LtDxuKhqxHOxotxckxAioigbf0s9Fm+kfslFBg9J9OMK7dsbD/cj9oLdTam9+imhojZbtdmPR7qYClB8NYmLZiafZHtsR1dfTKVFA== 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=yMyxyGTau+vyhK5GDtyglhw5cJf7FRE5RPE0f3kXem8=; b=GcCwqi1dPMsv9HoLAFJ79St5s7jrlXlwIbcGJTD3pJwcBAhC0nkWI5BSiY3kUV8yq62iJV2hhe2ZEs6oor2ROjxMMfmPiKtEceV+74asyEOk9J+ISGvw+ZrfWztjpF4oVrNivdUBWK3ngZaeyKsq5Fjv40lZT09riLN/qWRNh1nxuNXk9zNFdzNPayJUT84WJgVar+aJ62LPVfOeWfVI9EiZsnT45TvuAAxMbN5gnQSvY+Fk4UUbKPwleFhQFxm7ZdJRlncVdfX6s7NWVP+Vdubi4z1PU1oneN8XCwgvfmohmxgdPRcUwhISfMuJa1em0MvchUJA7TvhlAHmBB47ww== 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=yMyxyGTau+vyhK5GDtyglhw5cJf7FRE5RPE0f3kXem8=; b=c/1ObWKw0M58Tkn20nErgPEMThJCyl06wExIWFyNVlcMZR/ZF/iRG9VeNWxeC8IgpQzPnZ6rK39wkpc8YhcLOviKvnS+Lnqd3L76U1VjOM3d/sBigJ0LVQ/qeye5pTlpKUR3l/rEKjjK6rO8yBkdTrqJ1GhiudjnBsjQUiHmLGFy1chkGFkWsauZVK4AdAM0OxwHgI9WRdHjZ5WnKOMxeksnqSJzAJoy9xA7TUpNF0AR34VYNTkgHZU0hiA6ukuFbXlduqeX/m6uttkrM97toWgCIeqQe8bzJd7L+OutbnLsilnL1uX65oOYYpMh20CEW2yNSj/ffdAEQZXwA0B+7Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0279.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Sun, 2 Oct 2022 16:42:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 16:42:26 +0000 Message-ID: Date: Sun, 2 Oct 2022 18:42:32 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [EepJT63iIr3RZ/gXjjkcfbrvhcWXNp6NKEDenrJsoec=] X-ClientProxiedBy: ZR0P278CA0092.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0279:EE_ X-MS-Office365-Filtering-Correlation-Id: f18d4c34-334b-46ac-50a5-08daa49516df X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CHFqbl1LtFJLJay3v7Qqs0Qib5qtypIAU2EndAdtI8SGLSt3q7zH6HavHxu3/A5FweixM2gptQSFyachZ212IWEN4VbdkvOwlDShG065iJ/ysCUCBt266izpeW2+8Kp5CZlDNpybH7Zpi7SS/kUMQJc7vPNLWACvmyxIPsOlGenOxs2+WJ8cHwAav2nxcVAIPa6oiiiSeOqwNUSQq2Lic5jIk2KtLAtqKfkgoxMnqpSIQeTsIGL/69iWNjEZZFyNb5bBFdKN6l/mV52UhJaQBVixAP3Eor7Q+jbTnGIj3u3WX1C56EIwR3fno8klGRTaAg3hM7W4huN72MTfkjvbkAlS8G5PDPx/wFaT8kZDHpGRucaqktRm5z/JmHJQyTRy+4RPNgkWaFXE+Zqz18aTeJPBgfKXuWMdk+rHPfIS9FAcEWWWPhsc60NALS9Arha+1upuPQEhDpJU+Dd++uf3o3nwltrXxluzDbkULcceUZD7RvEoUo3LAt/p7x2r8pVzir0zlPa3db+TrdndGEFBeXBrKJE7wJl9f9n851BgHR+gMf5UNEityZDf0+lYY90VldBznwItBSFdBs1BBqHx8rbtl4TmfzXu+bnNjoHygVIooh15f3HRT46p2pKlIvli/uBKZ5RHw/r1ZkiFD7sEJKAC28YNJLV1u/q9v5S1zkPccghfhP5aFjPbSSgSG2pS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZURaQm1uWkpNVVlwMDZxM2ZmRmludjVVTC9jSWcxZHFUMWFnaEZyYmN0RVJF?= =?utf-8?B?YmhIOE9PempJaWNRTDZpN3JLVS94ZEt6TnFQU0ZNWjNkc2xuamRjVmpaYkJy?= =?utf-8?B?STM4VGw3RDVnenpTaFBIUmw4MUYzSC9HOTVmSGNYTllOSUJHMWxVa2xVVWJx?= =?utf-8?B?RDNsdW9sVXdYVHBkRjVLZnBwWFo5azlRaHljUWhoYnBCZnhMVlhsRFVyTXBB?= =?utf-8?B?Y0g4aFl2OVk3am5CSUQ5Z3dCajZCbCtqNVFVeDdQTTdoeVYxTWtQVVZpSzhK?= =?utf-8?B?dFdBYlplUjl6N0RsclBLTEpYMmhEd01URXVaZWNCbjhPV3FFZjd4ZWVVemRY?= =?utf-8?B?ZTZzNjNJTDBYczJ6azNmUHBzaWpMVjlSd0NmN1BISnV6dHVYakNnVnJuY0xt?= =?utf-8?B?dm5hZlRDaEFubFQvU1VKY3JsWDNpd1l6bEVhcVlCdlZIV1hvRVFIWk9CQnlM?= =?utf-8?B?YmJEbEFzUy9raEREZkZSMEpqVTFtVGlMd0x1OFgwNkFxWXBQOWNIUDZNUUlF?= =?utf-8?B?L1I3ZVF2UkZGMTdrQUtpWHlSR3l3V05qUHBacHVRNlpabXlqUDgwMmkzT2FQ?= =?utf-8?B?dzZFa2xFanZDZmErTzQ0aVFFWDNCcFRZLzZVSUpsYzJKUEM5NGNCYUFPaVNu?= =?utf-8?B?Uy83OXVOa2pxdmFNb2pxWERTQlplM01HRkllMTN0UzBCODdQcUdNV1FOUkVt?= =?utf-8?B?T0JGeFd0YndvdmJVS3VyTklNWkowR21hZm9WRFRCd1p1NGNLY3gzSm5uZ1BF?= =?utf-8?B?UVhxQVBPOEtoeTc1MnF5R3BKUXhqejdGMHRmSWY5UitEODkzRjFuMGdobUJk?= =?utf-8?B?bzRDR25uR0Vxdjg3QnQ4M25NeW9iV1FCUUxwalNGaVJ3cnREaXNHVldGTWF4?= =?utf-8?B?cVRUdVJ3WGlVMWFob0RGM05BalRRSE8rd3Y0MS81VXRPSi9LQXlFcG1sbHlZ?= =?utf-8?B?R0tmbXVWZGRBbGpXTnJ2QzVQQVNWaENUai9CdjYvR0V2b0NvNG1hT2VhU1R3?= =?utf-8?B?eWJmN3B3eEFMQ2tIUjEyNHJKVzRSc3RvTmpGK3NiSi9CVWx2Uk5mLzRWQlRV?= =?utf-8?B?Vk1NSHBacnNYcjlnR1NNSFpCa1MyaUdweVRFZU5tazVaYlp2RWhqUEZFc1Br?= =?utf-8?B?NHNqQWFQZzlqVGtJU3lKV3hIZjdmd0dWaGFtM2hqMkVwLzlCK3hkZldVcDRP?= =?utf-8?B?TC9FVE40Z0M4UllmUGRNTFdjTUQ1WHl4Zm1CWU43bzJ2Q3Q1VXRyRnNzbVZP?= =?utf-8?B?d0VUYzJyaWJQdkl2RzVRSlhmREw4cCtRYmtiN0hQbFlzcjFqalZxWE5wTmFv?= =?utf-8?B?UFcyTU1keENIclBHYytpQW5sNlFFUmVOR1NYbk1BeFN6ODN5c1MwY2duRTVO?= =?utf-8?B?dkdKU0VianVLRXFldVZrWFRNL01uSUY5Tk14cXRmQmtWdlIyLzdDekJOOGQv?= =?utf-8?B?dWtpbXBhKzU1d1VrNGp4VjZqOElBaEpxSnNkRlVOOXlrWE4wdDdESEp3ZU1M?= =?utf-8?B?ek5nQnpQVUprUmk1aGhGZExOZ1ROTFdCYU05MUEvMVF3UTczZVpWZTVnWkRj?= =?utf-8?B?eVdRZXZzTVlyT053bVVGWUxXK0w3MlB5WHIrcUVRNG8zdE5tbnhsUkFRT0lz?= =?utf-8?B?RzdiZ3VFZWRiQUJuWlorUnVRN3lNWURieHlMMkNCdlQxRXJ5S3RocllBUlI1?= =?utf-8?B?djAyRTdVYUxZSk5jVWFhb0FBTE1iTTQ3YzZKQndYQ3BsUTQrOThvR3M0R2x4?= =?utf-8?Q?zHThinIVuxq0dBlxAmO4cBQe9aL4adMFCxs7f7g?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f18d4c34-334b-46ac-50a5-08daa49516df X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 16:42:26.9049 (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: AM8P250MB0279 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/vorbis: Split data declarations out into new header 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 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: Andreas Rheinhardt: > vorbis.h currently contains stuff only used by the native > Vorbis codecs and some Vorbis tables, which are also used by > Opus and libvorbis. Therefore split the data out into a header > of its own. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/libopusdec.c | 2 +- > libavcodec/libopusenc.c | 2 +- > libavcodec/libvorbisenc.c | 1 - > libavcodec/opus.c | 2 +- > libavcodec/vorbis.c | 1 + > libavcodec/vorbis.h | 10 ++-------- > libavcodec/vorbis_data.c | 2 +- > libavcodec/vorbis_data.h | 34 ++++++++++++++++++++++++++++++++++ > libavcodec/vorbisdec.c | 1 + > libavcodec/vorbisenc.c | 1 + > 10 files changed, 43 insertions(+), 13 deletions(-) > create mode 100644 libavcodec/vorbis_data.h > > diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c > index 31a04dfbeb..9b9a610343 100644 > --- a/libavcodec/libopusdec.c > +++ b/libavcodec/libopusdec.c > @@ -31,9 +31,9 @@ > #include "codec_internal.h" > #include "decode.h" > #include "internal.h" > -#include "vorbis.h" > #include "mathops.h" > #include "libopus.h" > +#include "vorbis_data.h" > > struct libopus_context { > AVClass *class; > diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c > index 81e765403f..75bc491c9e 100644 > --- a/libavcodec/libopusenc.c > +++ b/libavcodec/libopusenc.c > @@ -29,8 +29,8 @@ > #include "codec_internal.h" > #include "encode.h" > #include "libopus.h" > -#include "vorbis.h" > #include "audio_frame_queue.h" > +#include "vorbis_data.h" > > typedef struct LibopusEncOpts { > int vbr; > diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c > index f78a88bbcd..6331cf0d79 100644 > --- a/libavcodec/libvorbisenc.c > +++ b/libavcodec/libvorbisenc.c > @@ -29,7 +29,6 @@ > #include "codec_internal.h" > #include "encode.h" > #include "version.h" > -#include "vorbis.h" > #include "vorbis_parser.h" > > > diff --git a/libavcodec/opus.c b/libavcodec/opus.c > index 3540206347..b91f57dec3 100644 > --- a/libavcodec/opus.c > +++ b/libavcodec/opus.c > @@ -33,7 +33,7 @@ > #include "opus_celt.h" > #include "opustab.h" > #include "internal.h" > -#include "vorbis.h" > +#include "vorbis_data.h" > > static const uint16_t opus_frame_duration[32] = { > 480, 960, 1920, 2880, > diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c > index cca2aa7c63..d0b660b44a 100644 > --- a/libavcodec/vorbis.c > +++ b/libavcodec/vorbis.c > @@ -30,6 +30,7 @@ > > #include "avcodec.h" > #include "vorbis.h" > +#include "vorbis_data.h" > > > /* Helper functions */ > diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h > index 0dd109dd2e..aa1ec5719d 100644 > --- a/libavcodec/vorbis.h > +++ b/libavcodec/vorbis.h > @@ -21,15 +21,9 @@ > #ifndef AVCODEC_VORBIS_H > #define AVCODEC_VORBIS_H > > -#include "avcodec.h" > +#include > > -extern const float ff_vorbis_floor1_inverse_db_table[256]; > -extern const float * const ff_vorbis_vwin[8]; > -extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; > -#if FF_API_OLD_CHANNEL_LAYOUT > -extern const uint64_t ff_vorbis_channel_layouts[9]; > -#endif > -extern const AVChannelLayout ff_vorbis_ch_layouts[9]; > +#include "avcodec.h" > > typedef struct vorbis_floor1_entry { > uint16_t x; > diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c > index 4f4ea03f15..1ebe146d8f 100644 > --- a/libavcodec/vorbis_data.c > +++ b/libavcodec/vorbis_data.c > @@ -21,7 +21,7 @@ > #include "libavutil/channel_layout.h" > #include "libavutil/mem_internal.h" > > -#include "vorbis.h" > +#include "vorbis_data.h" > > const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { > { 0 }, > diff --git a/libavcodec/vorbis_data.h b/libavcodec/vorbis_data.h > new file mode 100644 > index 0000000000..0fe19e509f > --- /dev/null > +++ b/libavcodec/vorbis_data.h > @@ -0,0 +1,34 @@ > +/* > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#ifndef AVCODEC_VORBIS_DATA_H > +#define AVCODEC_VORBIS_DATA_H > + > +#include > + > +#include "libavutil/channel_layout.h" > + > +extern const float ff_vorbis_floor1_inverse_db_table[256]; > +extern const float * const ff_vorbis_vwin[8]; > +extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; > +#if FF_API_OLD_CHANNEL_LAYOUT > +extern const uint64_t ff_vorbis_channel_layouts[9]; > +#endif > +extern const AVChannelLayout ff_vorbis_ch_layouts[9]; > + > +#endif /* AVCODEC_VORBIS_DATA_H */ > diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c > index 4a85500c10..715a7f7d03 100644 > --- a/libavcodec/vorbisdec.c > +++ b/libavcodec/vorbisdec.c > @@ -40,6 +40,7 @@ > #include "get_bits.h" > #include "vorbis.h" > #include "vorbisdsp.h" > +#include "vorbis_data.h" > #include "xiph.h" > > #define V_NB_BITS 8 > diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c > index b33d758e44..dcafe7d591 100644 > --- a/libavcodec/vorbisenc.c > +++ b/libavcodec/vorbisenc.c > @@ -33,6 +33,7 @@ > #include "fft.h" > #include "mathops.h" > #include "vorbis.h" > +#include "vorbis_data.h" > #include "vorbis_enc_data.h" > > #include "audio_frame_queue.h" Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ 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".