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 049E54A325 for ; Tue, 26 Mar 2024 17:49:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4177268D639; Tue, 26 Mar 2024 19:49:27 +0200 (EET) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 603E968D449 for ; Tue, 26 Mar 2024 19:49:20 +0200 (EET) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-56bb22ff7baso6889896a12.3 for ; Tue, 26 Mar 2024 10:49:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711475359; x=1712080159; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=KwGZxaIyc3wO/SD+TBTrRMvEaiZXVpjKcKscEAPvxJ0=; b=C8lkFQY4pHG+Mlj5lFbzofhAbAX1A54dOep3UvNIYRnLu8mvmqW//3gE2pY0nze0pB MRnAfQdTFJtlvLb279Eqs07L3oa3w4X0huZHSK0b3xgQP81Fir/1HQgo5Umi2AAJ/8N4 GkujiDgDdkZvMiIruFBNBC+Z7UySg4CKXxXvM/s6yKktPi4+/C3erVcUYeni9K6iM2/O pDZ/XGjXi3jVKOxw1PVkzjbUCNTLTz4bwJifKMWEZx2fa0hL3HioZMTGSEB6CoAvpI6j Wk0BDfiEKHfeoG6w++2d6oCBPF+VX5SK/31u8X8gk98RynPKUZVZVaE63lhY+JHfCEAg +BkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711475359; x=1712080159; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KwGZxaIyc3wO/SD+TBTrRMvEaiZXVpjKcKscEAPvxJ0=; b=Sug5CpW88DUDSSGGbbeIwhsVDLb6ylaZp+xXwHbMZp4q2yCngdjVUFY0pSSPwGVVKk WWV2igFOPWC+EmHhmjOQpJ1pL8TWBuEETedZ4hohUoGp85Y0RkHpD/aPeGo38TAmW6JG IuZTtF2Wr8qX3Kjmg/RqLjXIypOjPwDJbXy8x7cAAbwDaMe9FVqualFXHK9pO8S/UZbt Wmuh6DcOtdMwfqOu8aDMvjLnSTVvqkzneDmNXGWftqIeAhtbXm00ERrBlMACXqt/ueLf +ucIFej/v1ntMHjHHgPlip67CDcRCw9nTaB4rUrrBc9fcBW7WQOpPJetsXXAGpNWiY8U dsrg== X-Gm-Message-State: AOJu0YxPyXUh/tOFXHGfzIlkUSC72mLETio+XW3xN39BnWXEd1Y3C6PJ 3a7UBnIlvPel0LadIOIbhaPKS3OEmjGmcDwU/+Az23SNtLegaP7r9xvlNWcE X-Google-Smtp-Source: AGHT+IGcadaS01k/Wg1bQ6l8nZGDdMbtTOWyiEIHqUuW8lRX02xqgmXL8nuoBnyyCaJGRT81cYj/sw== X-Received: by 2002:a50:aad3:0:b0:56c:186f:9178 with SMTP id r19-20020a50aad3000000b0056c186f9178mr1434316edc.36.1711475358604; Tue, 26 Mar 2024 10:49:18 -0700 (PDT) Received: from mariano (net-93-70-84-101.cust.vodafonedsl.it. [93.70.84.101]) by smtp.gmail.com with ESMTPSA id ig4-20020a056402458400b00568b6d731e1sm4311193edb.4.2024.03.26.10.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 10:49:18 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id F0EA7BFCE0; Tue, 26 Mar 2024 18:49:16 +0100 (CET) Date: Tue, 26 Mar 2024 18:49:16 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches , Antoine Soulier References: <20240326164739.153011-1-asoulier@google.com> <20240326164739.153011-2-asoulier@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240326164739.153011-2-asoulier@google.com> User-Agent: Mutt/2.1.4 (2021-12-11) 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 Cc: Antoine Soulier 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: On date Tuesday 2024-03-26 16:47:36 +0000, ffmpeg-devel Mailing List wrote: > 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); 1e3f might be replaced by a symbolic constant/macro > + 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)); > + if (!liblc3->decoder[ch]) > + return AVERROR(ENOMEM); > + } > + > + 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; > + > + if (frame_us == 7500 && hr_mode) { > + av_log(avctx, AV_LOG_ERROR, > + "High-reolution mode not supported with 7.5 ms frames\n"); typo > + 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)); not sure if this can fail for different reasons (e.g. if it performs validation), if this is the case maybe you want to add an explicit check for malloc/ENOMEM [...] No more comments from me, thanks. _______________________________________________ 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".