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 03F3C4A367 for ; Tue, 26 Mar 2024 23:32:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97F7B68D6A7; Wed, 27 Mar 2024 01:32:14 +0200 (EET) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2104.outbound.protection.outlook.com [40.92.48.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92BDB68D67D for ; Wed, 27 Mar 2024 01:32:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UXsiLO5E3zJpuiM+Mug+yF99zHGYvJ1o2dav5ardpGH0xjzelv7jYfPNZm8y1KxAbg3104g1BaqHC6nH1qsPIWBKm0yYO3KikzIQBaudVwz13yfCXa3pjV3b+ovTX/BYj7Z44J3pKrP0fn3zGJDtbhVUfd+61PWvduE4FzM4Mg79Ixe2n+tS0RamVUTHUCfo+MD6NRV2+hj5mJ9XhsDdvrnEO4O1vq9TgJLIN6e/3sAZTsa5KaYr6qIeCiXrCwtzDgXH1gdcEzVzLDtfWI2mYQDy/W7igLzMSjpFkk5dBBWAJEA6Jgod5n6IrVWLkRco61gha+om248Y/Hv7N6WE6w== 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=j1UqsOWoIyfnEoUcKbbg0xWVEVVhvACEPO/BXtr3aKk=; b=OoHpiAKkQu/Wlo3mgXwNJKgDI1MZU7uVpyC9ahIQAnRsHNIAlPG5sjUAVwQi4woYNw4Rr8LStTdmMiqfWGojA8taBcwwCOc29Ux8DnrYkpJZ+G5Nska98VsrcxHl3zUuSX2JcIjiW5/R7/VZ0gPQeoytstCWtDiTBHrA2/lBDGKDl4BJQ6+Wn67wnKeSC6E3BEVq8fF1uKBZKDt9TiBsXNtC9OxiqKsCQbrklMGyCcc0STrQKEl6/39tpzH8i8h1h6vX+uOgbkWS5IV4DISI1JAJVclac2OQ+6I3qseQEmysvfmnaXV2pD0wXOR4K0CFmZNtYQJxv2m3zOviJR2jVw== 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=j1UqsOWoIyfnEoUcKbbg0xWVEVVhvACEPO/BXtr3aKk=; b=Qcv095Csy3g8EUaJUj1hii9o0+SxqFx+IIAe+C1HgcfYnhA7zGanLNa6HpYjVOlkO3Uz5vkitx7OqX7ApAIPk0Xd2B1VLfnHedQ762JTsBt3a7Ozd2qITPHh4J0OeY+qx1pkq+zReRnvBU1apwycdFEQBcKZkMn6DMA9ltYvkUHT7OYmtuCcbLHtHM7c+JEhFnNDwIplrWQ2nDZKJtQlIff1Oz/iNjVRff4FdB4cep1aJ6Qaazqliz7PpJlK5SUhIw7nU7sCGfV5WvNsTnGUxZ9vFNcudO7+Ny4Fe0t5ub7cBTVknjBYBIWxDtm86o6m8kGonouSXTUItv9bdED5NA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0056.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:35b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Tue, 26 Mar 2024 23:32:06 +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 23:32:06 +0000 Message-ID: Date: Wed, 27 Mar 2024 00:32:03 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240326230757.282319-1-asoulier@google.com> <20240326230757.282319-2-asoulier@google.com> From: Andreas Rheinhardt In-Reply-To: <20240326230757.282319-2-asoulier@google.com> X-TMN: [cigmMjMRyX3Js0mglTCFxRnWAEm3lTTzGmBS/cLQ3tw=] X-ClientProxiedBy: ZR0P278CA0200.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <8a448b70-1806-4c15-9cda-b01b67d61b87@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0056:EE_ X-MS-Office365-Filtering-Correlation-Id: fa316e78-6fea-4d11-0e95-08dc4decf29b X-MS-Exchange-SLBlob-MailProps: YfhX3sd/0TUvI142j/OdUAwACUTLhIpC4ewnnRc8UZm57PfHPiEMcqkamtt9yzP8qjRk2lWM7KX2KfWrzcnu+/AMay6SNr6IB/Sjv4eMoWm7bugqy+dH0TUyS8kjwqOPkz9zpjFB5KYikPfjVL/k2rVa/HHt+skXaiSrr4JAzlqdvnwUhez3J0EXvKhOtZqJvSJPqd6+hU4Ch0Gj0IT5F5UIMsS9TtksaEm/Kc3AqJOMoS2MngxersFBcGFqGsruB39n2MLGMgUGRc0/4xcdihIKkAT4BY/RVR+wex7gothsdwMcIg5FmRmE9j1gfevDyZtCzyuLJTKtvtTtjHUC/KIDStQDOCVkAR0q5Onl3xI6VXTuJ9zO2cKGbM+9hJtqG0w9Xj2XgI1BrI6/jR3+Eq4oAO4Fsx2p4pV/EPogdEUjrn5f0PwetxFXb8hX4A5ZiewOXnyz6zrQ26XvNXtxVlN9VmdQpD6Jrp8tovZFUSleZ8bfh/GZw5eZvrIqpUgelQItzMffCDF3dLA6lCG7vE7tgpAxfTi/a7RHXBP4pNW3wTtaG3RKU1vCkaDe39ON6va6RdMYNzfR+SnIcakjKtFMwnYOx3OBqrRladFRVyoWkuYyKPMswNuTFU3u6McWGrSrajrLE1KwR+Z4zr4S3DSYV1IPY5/FSIH1hPm5fGrbStuN8LroaqqyneS6HO+a6HDvFWr7JWRJI1mw1A+2JJXRdMo2dIpCag1up1kVg39Y/GrjvInq4VeuZ3Jh9YbfVwKUH5YVGCBYaCHy7A2b18Hz3A3OvIzNwCqC0vWLYNM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XwrTOPOFsffub6vb9iLq+u1TWD8Dc7igT8K9e9hWOegf88eB+vUjaZ9YmYVPG/J06p30KBgLwLFCB1OCRZBhCWSOxjlSI+jr92FGIGCoZt+4ZbkZjKV3l5UbkzXIG99Jfb6qzy+t1bYB9QpyJ8xDYYe0lTH9qxQs9ueNrxMTqQ0nNup4TVzmhFfI8F06CCsWCsKL/pnazeEwhiQhaAMuCyM52FaLBmd4UWUa6TkSJe4sLVsg9a/mr/jf+3uAO2zJlGtkqOYQo9UDREXPWX+HdZSMAK6oFpXvy3GvHq+Ma9eTcnJuTBbDOwZXeIfsH6MfoQn9F2MrPEjd5dWKyo0eoy4hCnQUzr4xvVY9cIZuqTuYdahbYrU/23MrANGUSBKRRCjwtg3eghGtGfKfFevzCV8Q1glcKqWGD+ZM4jaR3s/+DXTVmmHUfLQLHQs6z5vPwfLx5JvmWXraodBGKo9oSnicULzziRpG0oWNtF68c/gcv+iXiJu+CuYSKO5KNVugXBF24viFxIjkVLWPAKbH2sdYhZVzl9crpPW1B6PK0cd4xl7X4BaRUPniWuQb7p9wzDhWRwfs430bmaVgDJ883/X3XvttGRrWLHi1jJnF4PAoV3sXuRC6luDkk3syxSQ6VgUO9kYeFSdwKAYCyAYmibKw20yiVY0sNBVvjc7xqps= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MUtmeStJalJicWVrUFd2dzU3K2FTZU9ibm00Z212MFpaRFZoTzVqbnpLODVh?= =?utf-8?B?UkhraklOZ0ZnZjVjMTY3VWlmZmkxdUJpeng0VHM3Z2taeGV6RDlhV2NKcVcx?= =?utf-8?B?MzMzekV5SXQrME5NSDFFU1M0SmlQMURTek1tK01KWkxWK2RGMU9ESDRSZTJm?= =?utf-8?B?c2tJNEhHek1wak5FMkV4ZUNGVXc0TmZHclB4RGluZDYramczTlFzL2l5RXJn?= =?utf-8?B?VHdzb2N6Q2xrS3RPZWxuQ3lYd29iK0NFdkwvY2poMVhtZDR3VnNaK3huekQz?= =?utf-8?B?RXhzUVE2bllSYWlvS1crZGZ0NEsxKzU3ZzNVVmpXcUFnc2lOcCtTdTBZUXNQ?= =?utf-8?B?VndKa3kyZlpmcWtubFh3TkZFLzRNQjBPcjJoOC90UGFzcEdzdTBMOVlBUXlT?= =?utf-8?B?UUlDaTcwZkM3NnFjYnozNW1OQ1YzQ3JUZUpMZU5SUVhLRUsvRkd2dU9IUXF0?= =?utf-8?B?a3U1UVpxcW81SGxoVTY0cDBTeVVZbTkzNE9RdURHNkNlZ3VlZlJIVTA1dWkv?= =?utf-8?B?bm5NZFQ0RkJXWGJOT0o4ck4rdTVKcDdkQzNMYWNsWmtCaGo3VUNoQWlSYTRN?= =?utf-8?B?ZXhMTHBJSUVoNmoyTUZlSHV0cnZvRlBObVl1QWpwSnNTV29ub0V5VVVmTEhq?= =?utf-8?B?V2Q3RE15a2lFUmxHSkd2bEw1SmdsbGZ1ZXREZ3E5UGVDNWNGRThWUERLQitr?= =?utf-8?B?Y2dTOG5JekVPeXpseGcwc0VMWmhWUEU4TU1oM1oyMWN0UkRPR1Q5SDFuYUpG?= =?utf-8?B?dm1rWkMvQkhMWFlRTjB0U0x1WDRZOWhKSnMvLzUxaEFoa3kyZFBwL0VVU3dn?= =?utf-8?B?eFdIUjF5VURnclpZVW1tVk5RYmpDMjBpNFdUMG8vMnRVT0xsWWhSMzBMN1VG?= =?utf-8?B?M0Y1VWo4UHMyU284Smo5RWJWODgyYy93YzNUY1pib3BTVkZOaGdPOEs2ejJ4?= =?utf-8?B?NVZhOGlQaTdYQmY2VkNuRmw0MGVVQ0JRTmttdjZWZFNxak1FSFQvMmROYzBP?= =?utf-8?B?dDlHQXZWWEF6OEhhWHo4bkVvamVUUWQzOGRIRStSRmxwQjV1anIxSURtOWRV?= =?utf-8?B?bDBvWjBxV3lrSEx3bTZjVjRoa0lJYUNhOE9HaUduQWxEdTM4WkdJTU1zWlly?= =?utf-8?B?NU1ud1NLMjk4Rk9NMDZkbmI5MzBoZWZBY3R3Y0Jhb0QxK00ySDZhcFhyYUxn?= =?utf-8?B?bTFDd3NYaUNjckNyYVE3bEtHb2JWclVMUmRqVHpPZnRnaytlY2RwY1E2TjJD?= =?utf-8?B?WmRUTjJrREk0Q0VCVmlOQTZxZm9ieXV4YzNKQ3dzVnFMRVlEbWgzd0pGcktJ?= =?utf-8?B?OU9pcTNPTFFlZkJTeWJ3NFdhZUNBN29KU1MyTlJIZURsc1l5OGI3bnRKZjUx?= =?utf-8?B?U3o0T1dqMUErWlYxTEVPSUxMOHAxM1VseWdtZ1JaSjNyVk5URXRCUUk5dUFs?= =?utf-8?B?bXJrckE3NEM1bFd1L3g2cVZzeTZGUG41dmltczZZRElhQmVtYWcwUEoyQXVy?= =?utf-8?B?MS9HV01zbHp2UnRPb1hROG5rVFFxL3p6VlB2Um9Rdmxjd0VtQVBqNEo5Ym05?= =?utf-8?B?MEVha1RBN3IwNXZ6WUgvYWtsYnJta1hzcjg3b0hINGFhRnJrblBXNVdFYk5r?= =?utf-8?B?ek1HMklkQVJQRVlIRWlWeGZhcFp0THdNWUdIMWFVeVFtV0gzem94aE4rOE90?= =?utf-8?B?QXNseUR6MWVnZUZJcWQ3ZGh4enBmY2dtck93dE9lUnREcnN1clNJdXJnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa316e78-6fea-4d11-0e95-08dc4decf29b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2024 23:32:05.9814 (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: AS8P250MB0056 Subject: Re: [FFmpeg-devel] [PATCH 2/5] avcodec/liblc3: Add encoding/decoding support of LC3 audio codec 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: Antoine Soulier via ffmpeg-devel: > The LC3 audio codec is the default codec of Bluetooth LE audio. > This is a wrapper over the liblc3 library (https://github.com/google/liblc3). > > Signed-off-by: Antoine Soulier > --- > libavcodec/Makefile | 2 + > libavcodec/allcodecs.c | 2 + > libavcodec/codec_desc.c | 7 ++ > libavcodec/codec_id.h | 1 + > libavcodec/liblc3dec.c | 138 +++++++++++++++++++++++++++++ > libavcodec/liblc3enc.c | 192 ++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 342 insertions(+) > create mode 100644 libavcodec/liblc3dec.c > create mode 100644 libavcodec/liblc3enc.c > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 9ce6d445c1..e70811dbd6 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1123,6 +1123,8 @@ OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o > OBJS-$(CONFIG_LIBJXL_DECODER) += libjxldec.o libjxl.o > OBJS-$(CONFIG_LIBJXL_ENCODER) += libjxlenc.o libjxl.o > OBJS-$(CONFIG_LIBKVAZAAR_ENCODER) += libkvazaar.o > +OBJS-$(CONFIG_LIBLC3_ENCODER) += liblc3enc.o > +OBJS-$(CONFIG_LIBLC3_DECODER) += liblc3dec.o > OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o > OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o > OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index 2386b450a6..f4705651fb 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -776,6 +776,8 @@ extern const FFCodec ff_libilbc_encoder; > extern const FFCodec ff_libilbc_decoder; > extern const FFCodec ff_libjxl_decoder; > extern const FFCodec ff_libjxl_encoder; > +extern const FFCodec ff_liblc3_encoder; > +extern const FFCodec ff_liblc3_decoder; > extern const FFCodec ff_libmp3lame_encoder; > extern const FFCodec ff_libopencore_amrnb_encoder; > extern const FFCodec ff_libopencore_amrnb_decoder; > diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > index 3bab86db62..7dba61dc8b 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -3425,6 +3425,13 @@ static const AVCodecDescriptor codec_descriptors[] = { > .long_name = NULL_IF_CONFIG_SMALL("QOA (Quite OK Audio)"), > .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, > }, > + { > + .id = AV_CODEC_ID_LC3, > + .type = AVMEDIA_TYPE_AUDIO, > + .name = "lc3", > + .long_name = NULL_IF_CONFIG_SMALL("LC3 (Low Complexity Communication Codec)"), > + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, > + }, > > /* subtitle codecs */ > { > diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h > index c8dc21da74..0ab1e34a61 100644 > --- a/libavcodec/codec_id.h > +++ b/libavcodec/codec_id.h > @@ -543,6 +543,7 @@ enum AVCodecID { > AV_CODEC_ID_AC4, > AV_CODEC_ID_OSQ, > AV_CODEC_ID_QOA, > + AV_CODEC_ID_LC3, > > /* subtitle codecs */ > AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. > diff --git a/libavcodec/liblc3dec.c b/libavcodec/liblc3dec.c > new file mode 100644 > index 0000000000..bed014652e > --- /dev/null > +++ b/libavcodec/liblc3dec.c > @@ -0,0 +1,138 @@ > +/* > + * LC3 decoder wrapper > + * Copyright (C) 2024 Antoine Soulier > + * > + * This file is part of FFmpeg. > + * > + * Permission to use, copy, modify, and/or distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES > + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR > + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES > + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN > + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > + */ > + > +#include > + > +#include "libavutil/intreadwrite.h" > + > +#include "avcodec.h" > +#include "codec.h" > +#include "codec_internal.h" > +#include "decode.h" > +#include "internal.h" > + > +#define DECODER_MAX_CHANNELS 2 > + > +typedef struct LibLC3DecContext { > + int frame_us, srate_hz; > + bool hr_mode; > + void *decoder_mem; > + lc3_decoder_t decoder[DECODER_MAX_CHANNELS]; > +} LibLC3DecContext; > + > +static av_cold int liblc3_decode_init(AVCodecContext *avctx) > +{ > + LibLC3DecContext *liblc3 = avctx->priv_data; > + int channels = avctx->ch_layout.nb_channels; > + unsigned decoder_size; > + > + if (avctx->extradata_size < 2) > + return AVERROR_INVALIDDATA; > + > + liblc3->frame_us = AV_RL16(avctx->extradata + 0); > + liblc3->srate_hz = avctx->sample_rate; > + liblc3->hr_mode = avctx->extradata_size >= 6 && > + AV_RL16(avctx->extradata + 4); > + > + av_log(avctx, AV_LOG_INFO, > + "Decoding %.1f ms frames\n", liblc3->frame_us * 1e-3f); > + if (liblc3->hr_mode) > + av_log(avctx, AV_LOG_INFO, "High-resolution mode enabled\n"); > + > + decoder_size = lc3_hr_decoder_size( > + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz); > + if (!decoder_size) > + return AVERROR_INVALIDDATA; > + > + liblc3->decoder_mem = av_malloc_array(channels, decoder_size); > + if (!liblc3->decoder_mem) > + return AVERROR(ENOMEM); > + > + for (int ch = 0; ch < channels; ch++) { > + liblc3->decoder[ch] = lc3_hr_setup_decoder( > + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz, 0, > + (char *)liblc3->decoder_mem + ch * decoder_size); > + if (!liblc3->decoder[ch]) > + return AVERROR_INVALIDDATA; > + } > + > + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; > + avctx->delay = lc3_hr_delay_samples( > + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz); > + avctx->internal->skip_samples = avctx->delay; > + > + return 0; > +} > + > +static av_cold int liblc3_decode_close(AVCodecContext *avctx) > +{ > + LibLC3DecContext *liblc3 = avctx->priv_data; > + > + av_free(liblc3->decoder_mem); > + > + return 0; > +} > + > +static int liblc3_decode(AVCodecContext *avctx, AVFrame *frame, > + int *got_frame_ptr, AVPacket *avpkt) > +{ > + LibLC3DecContext *liblc3 = avctx->priv_data; > + int channels = avctx->ch_layout.nb_channels; > + uint8_t *in = avpkt->data; > + int block_bytes, ret; > + > + frame->nb_samples = lc3_hr_frame_samples( > + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz); > + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) > + return ret; > + > + block_bytes = avpkt->size; > + for (int ch = 0; ch < channels; ch++) { > + int frame_bytes = block_bytes / channels > + + (ch < block_bytes % channels); > + > + > + ret = lc3_decode(liblc3->decoder[ch], in, frame_bytes, > + LC3_PCM_FORMAT_FLOAT, frame->data[ch], 1); > + if (ret < 0) > + return AVERROR_INVALIDDATA; > + > + in += frame_bytes; > + } > + > + frame->nb_samples = FFMIN(frame->nb_samples, avpkt->duration); > + > + *got_frame_ptr = 1; > + > + return avpkt->size; > +} > + > +const FFCodec ff_liblc3_decoder = { > + .p.name = "liblc3", > + CODEC_LONG_NAME("LC3 (Low Complexity Communication Codec)"), > + .p.type = AVMEDIA_TYPE_AUDIO, > + .p.id = AV_CODEC_ID_LC3, > + .p.capabilities = AV_CODEC_CAP_DR1, > + .p.wrapper_name = "liblc3", > + .priv_data_size = sizeof(LibLC3DecContext), > + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > + .init = liblc3_decode_init, > + .close = liblc3_decode_close, > + FF_CODEC_DECODE_CB(liblc3_decode), > +}; > diff --git a/libavcodec/liblc3enc.c b/libavcodec/liblc3enc.c > new file mode 100644 > index 0000000000..f9c72293e3 > --- /dev/null > +++ b/libavcodec/liblc3enc.c > @@ -0,0 +1,192 @@ > +/* > + * LC3 encoder wrapper > + * Copyright (C) 2024 Antoine Soulier > + * > + * This file is part of FFmpeg. > + * > + * Permission to use, copy, modify, and/or distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES > + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF > + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR > + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES > + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN > + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > + */ > + > +#include > + > +#include "libavutil/intreadwrite.h" > +#include "libavutil/opt.h" > + > +#include "avcodec.h" > +#include "codec.h" > +#include "codec_internal.h" > +#include "encode.h" > + > +#define ENCODER_MAX_CHANNELS 2 > + > +typedef struct LibLC3EncOpts { > + float frame_duration; > + bool hr_mode; The target of a AV_OPT_TYPE_BOOL option must be of type int. > +} LibLC3EncOpts; > + > +typedef struct LibLC3EncContext { > + AVClass *av_class; const AVClass * > + LibLC3EncOpts opts; > + int block_bytes; > + void *encoder_mem; > + lc3_encoder_t encoder[ENCODER_MAX_CHANNELS]; > +} LibLC3EncContext; > + > +static av_cold int liblc3_encode_init(AVCodecContext *avctx) > +{ > + LibLC3EncContext *liblc3 = avctx->priv_data; > + bool hr_mode = liblc3->opts.hr_mode; > + int frame_us = liblc3->opts.frame_duration * 1000; > + int srate_hz = avctx->sample_rate; > + int channels = avctx->ch_layout.nb_channels; > + int effective_bit_rate; > + unsigned encoder_size; > + > + if (frame_us != 2500 && frame_us != 5000 && > + frame_us != 7500 && frame_us != 10000 ) { > + av_log(avctx, AV_LOG_ERROR, > + "Unsupported frame duration %.1f ms\n", frame_us / 1e3f); > + return AVERROR(EINVAL); > + } > + > + hr_mode |= srate_hz > 48000; > + hr_mode &= srate_hz >= 48000; > + > + if (frame_us == 7500 && hr_mode) { > + av_log(avctx, AV_LOG_ERROR, > + "High-resolution mode not supported with 7.5 ms frames\n"); > + return AVERROR(EINVAL); > + } > + > + av_log(avctx, AV_LOG_INFO, "Encoding %.1f ms frames\n", frame_us / 1e3f); > + if (hr_mode) > + av_log(avctx, AV_LOG_INFO, "High-resolution mode enabled\n"); > + > + liblc3->block_bytes = lc3_hr_frame_block_bytes( > + hr_mode, frame_us, srate_hz, channels, avctx->bit_rate); > + > + effective_bit_rate = lc3_hr_resolve_bitrate( > + hr_mode, frame_us, srate_hz, liblc3->block_bytes); > + > + if (avctx->bit_rate != effective_bit_rate) > + av_log(avctx, AV_LOG_WARNING, > + "Bitrate changed to %d bps\n", effective_bit_rate); > + avctx->bit_rate = effective_bit_rate; > + > + encoder_size = lc3_hr_encoder_size(hr_mode, frame_us, srate_hz); > + if (!encoder_size) > + return AVERROR(EINVAL); > + > + liblc3->encoder_mem = av_malloc_array(channels, encoder_size); > + if (!liblc3->encoder_mem) > + return AVERROR(ENOMEM); > + > + for (int ch = 0; ch < channels; ch++) { > + liblc3->encoder[ch] = lc3_hr_setup_encoder( > + hr_mode, frame_us, srate_hz, 0, > + (char *)liblc3->encoder_mem + ch * encoder_size); > + if (!liblc3->encoder[ch]) > + return AVERROR(EINVAL); > + } > + > + avctx->extradata = av_mallocz(6 + AV_INPUT_BUFFER_PADDING_SIZE); > + if (!avctx->extradata) > + return AVERROR(ENOMEM); > + > + AV_WL16(avctx->extradata + 0, frame_us); > + AV_WL16(avctx->extradata + 2, 0); > + AV_WL16(avctx->extradata + 4, hr_mode); > + avctx->extradata_size = 6; > + > + avctx->frame_size = lc3_hr_frame_samples(hr_mode, frame_us, srate_hz); Does this function do anything else than frame_us * srate_hz / 1000? > + > + return 0; > +} > + > +static av_cold int liblc3_encode_close(AVCodecContext *avctx) > +{ > + LibLC3EncContext *liblc3 = avctx->priv_data; > + > + av_free(liblc3->encoder_mem); av_freep is preferred so as not to leave dangling pointers behind. > + > + return 0; > +} > + > +static int liblc3_encode(AVCodecContext *avctx, AVPacket *avpkt, > + const AVFrame *av_frame, int *got_packet_ptr) > +{ > + LibLC3EncContext *liblc3 = avctx->priv_data; > + int block_bytes = liblc3->block_bytes; > + int channels = avctx->ch_layout.nb_channels; > + uint8_t *data_ptr; > + int ret; > + > + if ((ret = ff_alloc_packet(avctx, avpkt, block_bytes)) < 0) It seems that lc3 has a fixed blocksize. If so, you should use ff_get_encode_buffer(). > + return ret; > + > + data_ptr = avpkt->data; > + for (int ch = 0; ch < channels; ch++) { > + int frame_bytes = block_bytes / channels > + + (ch < block_bytes % channels); > + > + lc3_encode(liblc3->encoder[ch], > + LC3_PCM_FORMAT_FLOAT, av_frame->data[ch], 1, > + frame_bytes, data_ptr); > + > + data_ptr += frame_bytes; > + } > + > + *got_packet_ptr = 1; > + > + return 0; > +} > + > +#define OFFSET(x) offsetof(LibLC3EncContext, opts.x) > +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM > +static const AVOption options[] = { > + { "frame_duration", "Duration of a frame in milliseconds", > + OFFSET(frame_duration), AV_OPT_TYPE_FLOAT, > + { .dbl = 10.0 }, 2.5, 10.0, FLAGS }, > + { "high_resolution", "Enable High-Resolution mode (48 KHz or 96 KHz)", > + OFFSET(hr_mode), AV_OPT_TYPE_BOOL, > + { .i64 = 0 }, 0, 1, FLAGS }, > + { NULL } > +}; > + > +static const AVClass class = { > + .class_name = "liblc3 encoder", > + .item_name = av_default_item_name, > + .option = options, > + .version = LIBAVUTIL_VERSION_INT, > +}; > + > +const FFCodec ff_liblc3_encoder = { > + .p.name = "liblc3", > + CODEC_LONG_NAME("LC3 (Low Complexity Communication Codec)"), > + .p.type = AVMEDIA_TYPE_AUDIO, > + .p.id = AV_CODEC_ID_LC3, > + .p.capabilities = AV_CODEC_CAP_DR1, > + .p.ch_layouts = (const AVChannelLayout[]) > + { { AV_CHANNEL_ORDER_UNSPEC, 1 }, > + { AV_CHANNEL_ORDER_UNSPEC, 2 }, { 0 } }, > + .p.supported_samplerates = (const int []) > + { 96000, 48000, 32000, 24000, 16000, 8000, 0 }, > + .p.sample_fmts = (const enum AVSampleFormat[]) > + { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, > + .p.priv_class = &class, > + .p.wrapper_name = "liblc3", > + .priv_data_size = sizeof(LibLC3EncContext), > + .init = liblc3_encode_init, > + .close = liblc3_encode_close, > + FF_CODEC_ENCODE_CB(liblc3_encode), > +}; _______________________________________________ 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".