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 205964A335 for ; Tue, 26 Mar 2024 18:28:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99A5768D65A; Tue, 26 Mar 2024 20:28:02 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2031.outbound.protection.outlook.com [40.92.59.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 963B268D61F for ; Tue, 26 Mar 2024 20:27:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gEVdeZQ4uRLLG/U70BsMtwqlgCvvHjLzkbF+yCwr5OpDDLLdV1w5NIh/3nqPQLgCviuG3mGDsijWUWvXXPgWgUx7mfJidcMAumytUyO0hpUtU60MO2s2W8+StbrmSp9H6+3h6RERLmDf+ff1Z3tp6Bysm5Z9FbmJPSDU1ZJvud8ZKgeZkDBM9XmBM3LioegGTohi7PZnvjMU2fqi77BnC15TpV32fSLPXPW/ZWgZ506QOb3ez4bkJiltZ18SD2vlm5J1VGg8fjsrxSFVttR38aBPFPdrOQbqppKSCTU8RFGC7878w0mVHn+qA9Vmu+dht3CSq0qpxlnWmDtThWw9dA== 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=cDS1zs3vH0AvfXq5UK9zzryF1Vcskhq0Ei9rHEWovWc=; b=fICUW2TVivWleRrbeDeJs9FmXZ1DqYl8fcbD/5JC1s3WxJ5jVN2MJjpE5lLznJgsc1ARZaAmVIZwWjnQnhkcll6a1QDjQftwkIyQclmyFXmxAZKcBXo3bR0g/sSCrLOeRDP1IKFuZB2wvEMVfwuB3wk5olCFNI1JtzBq0vEjrPtGovWbknrm3e9nNJM0H2d4T/rvs75DCB2+0I1Q7vrc0zfW3ZMLuf0MpI3Ns2ZhSJs6hKMabc9jNU812KjZUM4ZF46a8viE9p9Xe3uudVk+Z7IUpuUNgmLEnstDs1KXZ92dUk9cMLp7ZCWEBmvL6M4hjZbr6RxTkTkny8l8nGHAsA== 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=cDS1zs3vH0AvfXq5UK9zzryF1Vcskhq0Ei9rHEWovWc=; b=lW5emGcaL4V0F6tvw2IE5CmZgCBGleRTktNw5PkzE8ulyFH9/va6K6frWS0Ns+SL/d2uUCmyXTHaV4PQ8mVDFCYn5K6lov9t5heLLNO2nrIIjixnX7uVOx58AI8Lg96QvgRwlHmbSs3VzYcwEw4BnTDWTJC9a2J2lh/CJYvcrmbLPfb92l84jLiTE1Hx5Rf3ZNRwL2PR9wniHt9TxFshN0luh2+LUS1bN2gs19IGCk3cL3RudrVe4b/qRDSYhIjFZ73SjqTIhTK7Md2glv9PeoOhRbiO32hN+e4zypI9M5CWVvqwygzxNvb6WWzU2HNiHPlnMQlQ0R/rZgoUl2nDEw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0601.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:345::6) 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 18:27:53 +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 18:27:53 +0000 Message-ID: Date: Tue, 26 Mar 2024 19:27:52 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240326164739.153011-1-asoulier@google.com> <20240326164739.153011-2-asoulier@google.com> From: Andreas Rheinhardt In-Reply-To: <20240326164739.153011-2-asoulier@google.com> X-TMN: [oodwYmksl0OK529NFskAiPEjrKQG7TX/LP3KBSsqerY=] X-ClientProxiedBy: FR0P281CA0222.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ac::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <85bb26f8-4fb3-4389-96dd-45eb8e698adf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0601:EE_ X-MS-Office365-Filtering-Correlation-Id: 2394cc2a-1efb-433c-a88a-08dc4dc27366 X-MS-Exchange-SLBlob-MailProps: YfhX3sd/0TVxMCof6kCq3aJ2/6rrfIKS1zicmXUze92Yk+sz8YiLVi/PVB0adewzRts3cSNdCkt05bfgliM0HvcZdwwlzJEb7UYXEOZi1JQgX+ix0xgPCvH0eIPfG3sFp3x0Pp5moK+R86hwmcTF4dNWVpTXyIeRe3nJxjC9uyOFIiUcIRnfO79AmjXIUaa8DF/k+/JQwInywFmV1fx8uhNo3VkZ3vQhIpH/E9IPj1bbPuzTz1p9nB49lvqFRs2JBBUsFYM2s77mK7sD064XRJ6OUVOc8AenxKB1Cyerq56hmmVhQtfOvBfkdBXwFnPTJxgeGtOqLREsycM+qtHbKqbyGpRFIe+eFr32loTld8LbkQ7WQtQTjuTtwK1lQdJD7Cy7quCXbt73X8rp8ItFuYjXo5FDR1wWcFaBN1Y7ZeyY4woY1sOxBDr6NKfK+FIo/a2WZ1IQ21fVgnlls1vmf+4gvwDyrVitjnLE+bIS/GyPP1bVi2YVnBUsitwVHHlI426AJqlZNR3lGF2iAuXeSfxKIObwGwB9Xu+F2XZkg5+cKUM6pPemzB44IclNgZvbTv7EykLWTUTWG7QK0BA7899gL+8OVUgDEYo3NmcxrKe6BdPvST9fHqNUp1Ir9f/2/6bdxj9wLquOJ/NLA2lOZ5C7AqGk/3jGJHXb3R23NMIKjoaC0jU8BnqL8vo1lbpN/L8wTjeBvXMpJUSKOyo1XX/jCcpKYcgu+UcRmk7rV0aE5LNGVH4OEuUtOHqAOSPfixtyBHTlOdQPeIv2k8QP4lrF/3qrqKEgaxeX58AhGCs= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5GAcfRKWPRkUlrEpw9REOCX3zWI8OicNIoMPD0xBRTZPeTh5tewXA8410ggQp4QuDNLzBkuqeJU8V2NDGBdiaKL1VU+XQ1tEzVrfmXCTQ/FpsDX8veVaaqSCvphTrL+HRQXUT+Js0GYB6gMwfp2D0eWkGBiuCgg3i4MPsqYksuBgjw0p1vXAQqhM+/NVV6lU08T0JoqUUGE4Y0oeJlYaRVA5Gjp0GRAJvFRmuuPPYGT7ARv3sz8c0uGnzuCjwfpw/4bcq5MtjKhxc+R7F5frts5yhDDVSdEncAsrvznW+vSXMZlNfw8ErF1xO8ZGdRbW0/+LOR4bGeJ4uQgaKpuuGmj4+CUiv6Mazg2q+IXYT0T1hc46fuk5FYvqDvI8vy5JHaKN8eSDMca6wmLd9gWIsePIcDqkAXaialEonCJ4ykbAlkTfUVnrRTh/gmqxy0Z/WA0bobxOfr/hF75z2G9wzvEQtzzCmCjdqxOpHU6OWwHoeCWmNdJdtg56It7axa+zY7S8jk71NKjEbbKz+gPtoPNcbq9se9OuywOqM8seHVodQ2+oeJthaQYk7j9kUH3sBP4k7xyeBTBwANncuAanmWYqGD3UlZMeBPFUVSzIWNcPY7ZuqnBybU3AUuOgSTCRBJB6bTsN7/ao8W5FTQX3XcfuzKh+w+2WFqunOd9PAfM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QWJEaWI1U0FXSzVuME15a3JJV1BSNi92aGNNOUM0cXphS1Z0cW5GanpVOFBv?= =?utf-8?B?c0NZUnppY1FZMHp6dENqMytla1Z0c3FDZ2F6RGtXdW9mTUcxTG9Ncms4VVdQ?= =?utf-8?B?cGpFelRxS20yM1h3ZWxlZURWZngwYnFieTY1NHp3RGFXSmM5V3ZEOCswSlha?= =?utf-8?B?Z1BhNVNjVEVHSTVISC9ObXlsTkkwMzhlUUplRjBoMm1PUGJNMXVQYkdBVlZT?= =?utf-8?B?Mk52dHBzd1lQSDF3SGNQQU1WdFJLWHQrR2RlYnk3Y2tESlJTUDA0UFBZVUYr?= =?utf-8?B?QzhUWkgzOEd4ZHhSK0RXWE5FemxpUll4WG81NnJvUUxhS0oxVExTT29Cd0Ns?= =?utf-8?B?RFhJK3ZSRGNGZlNTNFZqZmRrNDJFN25KTVFyZ1FBMVo3M2xVRjZiSjFnK3BJ?= =?utf-8?B?MGZ6ZGxYejl4RDlZVjk2dDBuTDNiMTgzanBQMlFqdzg5ck5mTXFSdERJb01X?= =?utf-8?B?bmhxNEhmcTIzRE1ObmoycnNOcW96Q09SbGt1djBtZVZyYjJIcHcvMHBtd3pr?= =?utf-8?B?Mlc3VjBEdkl1RU8rWUVuYlpNY29nTll5V2IzcmNYTUx3WUc3NnNXb2lxVVhj?= =?utf-8?B?cVNYamVjK3VTdGVWemxhQ05aWVFTcUcyUzl5MW5nOGh5TjZodWNma0l4WmZj?= =?utf-8?B?SzdxYncvQ08wM2M5ZVNUdGovVjBYTGxWK2dBOUFFU3lkR0Z0V3VUanZFZzVt?= =?utf-8?B?TDJrUm12YVlRbTQxL09QN3pXMDcvUTlLajllRzU0c2ZJTFNGRXFXTFFHSUhw?= =?utf-8?B?N1lnaVUyWFJza1pJSDhnajk1bkI0V2xXNXZJN3E3QmlKVFhpeHR3T0tGMC9x?= =?utf-8?B?RWUvK0h4d0xvUzZRQmk1a2Q2SnNYMU4zMEhRai9PZ1RhL0VuNVlHRXU1Ykhu?= =?utf-8?B?QVcrRlZWdm9NR09VYTBBRGJ4SGtEVWJMNGdHQUZpSTBERzdURWIrMXZiV3dQ?= =?utf-8?B?Ui9YNkt0ODVXa2sxTnNiTEdTbnRkVnJMTlpiNWUyY2JkWmEwbE9TVDFJN01W?= =?utf-8?B?NmpUZDFzWVRURWpzWHowNGNNQnlFbFhOSVJSSElkeDFHTkw5Q1lPWnBIcEIx?= =?utf-8?B?eFNNY2dCRlYwdy9PcElXaXZhdzBaUTU2bnpteUo1UG9sMk43RFI0US91eUxv?= =?utf-8?B?R0pJOUg2Z1ZPM3ZyMmM5K3J5VjUzNENpa1JtRFArblE0cHBpdEowazBpSk85?= =?utf-8?B?cW1BZC9UdVRNaXQxYXdMRy9uMHpTZTJRaytvRmJ3WEx6ZjBMTDBDOWtXWUho?= =?utf-8?B?REJJeUJIZFNkd3FEVVlqaEUxUlhuQ0R6azhvVmFyRzU0eWtDaVFUN0lzcGpi?= =?utf-8?B?eUhuVlJIMlVlb09pR2V0ckFWamhkNDlWRm1Nd0p4VjJCbGt5WEZYRzFLWk1v?= =?utf-8?B?dStIa1ZjczV5WHg5UWxCQnNhUkMwVWJROCtuVCtJT3o2eVJTK0VMcXVVRzRO?= =?utf-8?B?Wmpkdzd0SlAzQnQwS2JZNzl6VURCUC9nSVVWVC84bXprVVBHTmk2YXZPOUtC?= =?utf-8?B?bmg1cVB0T3UzTko4cEFFODVWS2p5b3FlNGZMcHZBYlN6L1ZLMlFUMHlaR2lz?= =?utf-8?B?R2tLS3FlYkJQOU5UYk55bFduVWdLTGUyWlVlSDFnYzF2cnMwVmtwTk80U1N1?= =?utf-8?B?Wk96SWJCbHZ2OVQ0RHFuV1BmVmUzRm45aFg2a1pRaFhHYnFXOFZWZWRSZEtx?= =?utf-8?B?YWNNSXF5MjRXc01HbjhHZCtWRWVCb1NKaXB6MkJ3Qm5veHJSOXVmRGdnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2394cc2a-1efb-433c-a88a-08dc4dc27366 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2024 18:27:53.6343 (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: DU0P250MB0601 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 > Signed-off-by: Antoine SOULIER > --- > libavcodec/Makefile | 3 + > libavcodec/allcodecs.c | 3 + > libavcodec/codec_desc.c | 14 +++ > libavcodec/codec_id.h | 2 + > libavcodec/liblc3dec.c | 146 ++++++++++++++++++++++++++++++ > libavcodec/liblc3enc.c | 191 ++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 359 insertions(+) > create mode 100644 libavcodec/liblc3dec.c > create mode 100644 libavcodec/liblc3enc.c > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 708434ac76..7d2cf3076d 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1123,6 +1123,9 @@ 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_LC3_DECODER) += liblc3dec.o > +OBJS-$(CONFIG_LIBLC3_LC3PLUS_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..29aedaeac6 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -776,6 +776,9 @@ 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_lc3_decoder; > +extern const FFCodec ff_liblc3_lc3plus_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..230bba2a09 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -3425,6 +3425,20 @@ 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, > + }, > + { > + .id = AV_CODEC_ID_LC3_PLUS, > + .type = AVMEDIA_TYPE_AUDIO, > + .name = "lc3_plus", > + .long_name = NULL_IF_CONFIG_SMALL("LC3plus (Low Complexity Communication Codec plus)"), > + .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..7e4cb39049 100644 > --- a/libavcodec/codec_id.h > +++ b/libavcodec/codec_id.h > @@ -543,6 +543,8 @@ enum AVCodecID { > AV_CODEC_ID_AC4, > AV_CODEC_ID_OSQ, > AV_CODEC_ID_QOA, > + AV_CODEC_ID_LC3, > + AV_CODEC_ID_LC3_PLUS, > > /* 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..e97cecc68f > --- /dev/null > +++ b/libavcodec/liblc3dec.c > @@ -0,0 +1,146 @@ > +/* > + * 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; > + 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 / 1e3f); > + 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; > + > + for (int ch = 0; ch < channels; ch++) { > + liblc3->decoder[ch] = lc3_hr_setup_decoder(liblc3->hr_mode, > + liblc3->frame_us, liblc3->srate_hz, 0, av_malloc(decoder_size)); 1. Leak on error (if this fails for the second channel, then the first channel's buffer will not be freed). Use FF_CODEC_CAP_INIT_CLEANUP for that. 2. Shouldn't there be a check for that av_malloc or is the idea that lc3_hr_setup_decoder() checks for us? 3. You can allocate the decoders jointly: ptr = av_malloc_array(decoder_size, channels) and then use (char*)ptr + ch * decoder_size as context for the decoder for channel ch. liblc3->decoder[0] would be the actually allocated pointer for freeing. > + if (!liblc3->decoder[ch]) > + return AVERROR(ENOMEM); What makes you believe that this is the only error that can happen? > + } > + > + 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; > + int channels = avctx->ch_layout.nb_channels; > + > + for (int ch = 0; ch < channels; ch++) > + av_free(liblc3->decoder[ch]); > + > + 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_lc3_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), > + .init = liblc3_decode_init, > + .close = liblc3_decode_close, > + FF_CODEC_DECODE_CB(liblc3_decode), > +}; > + > +const FFCodec ff_liblc3_lc3plus_decoder = { > + .p.name = "liblc3", > + CODEC_LONG_NAME("LC3plus (Low Complexity Communication Codec plus)"), > + .p.type = AVMEDIA_TYPE_AUDIO, > + .p.id = AV_CODEC_ID_LC3_PLUS, > + .p.capabilities = AV_CODEC_CAP_DR1, > + .p.wrapper_name = "liblc3", > + .priv_data_size = sizeof(LibLC3DecContext), > + .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..6495742c04 > --- /dev/null > +++ b/libavcodec/liblc3enc.c > @@ -0,0 +1,191 @@ > +/* > + * 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; > +} LibLC3EncOpts; > + > +typedef struct LibLC3EncContext { > + AVClass *av_class; > + LibLC3EncOpts opts; > + int block_bytes; > + 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 <= 5000 || hr_mode) > + avctx->codec_id = AV_CODEC_ID_LC3_PLUS; The encoder has to encode the format it advertises (via AVCodec.id); it must not change it. (What is actually the point of this using two different codec ids? You do not even need to tell the libraries whether you are decoding/encoding the +-version or not.) > + > + if (frame_us == 7500 && hr_mode) { > + av_log(avctx, AV_LOG_ERROR, > + "High-reolution 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(frame_us, frame_us, srate_hz); > + if (!encoder_size) > + return AVERROR(EINVAL); > + > + for (int ch = 0; ch < channels; ch++) { > + liblc3->encoder[ch] = lc3_hr_setup_encoder( > + hr_mode, frame_us, srate_hz, 0, av_malloc(encoder_size)); > + if (!liblc3->encoder[ch]) > + return AVERROR(ENOMEM); > + } > + > + avctx->extradata = av_mallocz(6); Padding > + 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); > + > + return 0; > +} > + > +static av_cold int liblc3_encode_close(AVCodecContext *avctx) > +{ > + LibLC3EncContext *liblc3 = avctx->priv_data; > + int channels = avctx->ch_layout.nb_channels; > + > + for (int ch = 0; ch < channels; ch++) > + av_free(liblc3->encoder[ch]); > + > + 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) > + 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".