From patchwork Fri Mar 22 17:01:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp41892pzb; Fri, 22 Mar 2024 10:01:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFqMqmSFJbIHEFp/zhFOHwf4qGiBXSFcX9FkdM1tI/ixbBvQwOa2fvEGKNnQL7k/SYkNh53gaEM0TFiJx2jvsIORt12fCL6N5+Jg== X-Google-Smtp-Source: AGHT+IEHQps5isdVmdC2s9+9emoD5UvULEifa6jVb19ru1UrTFa+eMSS+qfNYFdV9Qveb2QhXP64 X-Received: by 2002:a17:906:17c4:b0:a47:2395:f424 with SMTP id u4-20020a17090617c400b00a472395f424mr210739eje.26.1711126882156; Fri, 22 Mar 2024 10:01:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126882; cv=none; d=google.com; s=arc-20160816; b=G+//WvcS7sB1n1vDD38+wwl9GR9DP03K3aXV+ia0d9vxj1X5NKVdUlfdQIulQxXUUt jVsGi1eW37X/hLvP32H9YbG7XzrHDOWVPfAgdOD//V4IQW2109Y/OqRWkmt1hvacbpvZ +XzAcxxumrMDAjNeNwRnZ3Vxz5bPivqipxvklT7ulDEOU77UtdlhRdF0/NEsbDeiTVKq NY5QJ/GPfJrcHJ0FL6i1jBfSuyX1xTffbIVm47eO/WdrUvd6pxUfeuRTmxD3iEDMwviT 7bwSBbPJ7fhK0hmQ/jsANU0Ji1SlIX4YfgZjHSzmj/j7gZiO2lyW4+7ulpO8Lgunc2GZ aGFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:mime-version:date :delivered-to; bh=XXy8w88hAx+TcFUYGoK6hAg4rKlZYyzBam+iO7kNuSw=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=pFXrEfYxCHMWjd9XJsLJVK/4FghDI4ZYpIHa0oNbWEDPpu85rROOKVNV+mKJDlQjkK dC8eenDhmgVpncQiVwGLZ/F3/ZpTE2DnXL/R6TUSxS4iTKCm66ZGjWTqZeBvS1YNnySQ lwVXK+Z52VtwO/XQrFOoBMJWgSWdQHGOY3+aSwbZg0mW+zdovNqHdBKzqI3CATYrsf45 fh8G/C2T73Dm9GY/ZciVvxrFYwBXAZUk4JhhC04cPtYZopLviGS0ezwC4zg1ZBs/IvUP kwOBfWA/wrsUbdnslAKrkltIvg9N115crBfxQ5u+69U3nknHBRNdOMpCkKV+ABXqvaLM jRow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f27-20020a170906139b00b00a465a197b6bsi12469ejc.696.2024.03.22.10.01.21; Fri, 22 Mar 2024 10:01: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E55A68D564; Fri, 22 Mar 2024 19:01:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCAF068D4BC for ; Fri, 22 Mar 2024 19:01:11 +0200 (EET) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-609f2920b53so37206997b3.0 for ; Fri, 22 Mar 2024 10:01:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126870; x=1711731670; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fNHhSgiP0yvN0gOku38TamTG5zPZBHWgJMsHhHGOkEE=; b=CR71LSvc396U9Tb78CtXlkaIWe804va/NUnD71dNDtMfDAYn4EeoXSghzuwMFLMwI4 aBwEo8I5gkriRntyb8LOvtMUkbKiVKf6kSW56zg/FHrVRV1c/GI716Bw845e6Bxatg3D VIsB92zBdvrgbtwuRJV2AJIJkBQpE0IR9Xnms5I8VIdV1+LBLuy5E5X1ZDBncs6/CoQR VYKvMd8ebQvJUXCoW6Ea0HglczAkKl2AFcwiP51+y0pBWSGZV84/rAxicVNmNeaqYu3t 6Hth8f+VtmXPaNrAM0kR7y1LiY1mRYLw5cVmSSfP8GGB/IMlE+yy+HMb2rLMpZs/R17d GsaA== X-Gm-Message-State: AOJu0Yw+aFah+JOs5K/QAmsz4ytigbgHeKb/t1hcihTTNCL8TmbnMD09 Enp+rfDUOpoMTjen94krKXmQg8MqjgUKYLY/oYSGl6D2HfaeTHghotBEjyPMfe1YiQaGxfRFFAt /H3oQZazXTFY5OubfD7yCpILMNS+c/amo/XKbU4yfu5JEfEUK6VfbDxqmv8Jlo2NnbC1jxyjuXY F8MKd1skgiXmsjiTdz3NCzIJZkESwqomEU/kwWl95hObSU X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a81:de51:0:b0:609:f0f0:20c4 with SMTP id o17-20020a81de51000000b00609f0f020c4mr35286ywl.4.1711126869909; Fri, 22 Mar 2024 10:01:09 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:00 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-1-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/6] 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: , X-Patchwork-Original-From: Antoine Soulier via ffmpeg-devel From: Antoine Soulier Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WmwzrktMKNpw 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)); + 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"); + 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); + 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), +}; From patchwork Fri Mar 22 17:01:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp42141pzb; Fri, 22 Mar 2024 10:01:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8NwuCAo17M3Snnb8GJZi8GJZOR0d6uT6hV3JPfwzSoSB7q/1pESiQsQgF2yia7Hdn/bx/J/ONpTanGEoSmtURHAtAqvy3LB/Qmg== X-Google-Smtp-Source: AGHT+IETH5r5rPHmqDuEsLDeJoSB8MnTpYwG+N/HUR8nbocmdKbGitZPFKTHf33ndKDPhvF3jEhB X-Received: by 2002:a17:906:a008:b0:a46:ba8f:bcd4 with SMTP id p8-20020a170906a00800b00a46ba8fbcd4mr248861ejy.46.1711126896248; Fri, 22 Mar 2024 10:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126896; cv=none; d=google.com; s=arc-20160816; b=aekSnEbNqKQPRYWM5rqwyQPcjGSNeaiq75WCrbjS224iutsPAAJhcUyhbUVCOguCIu vll95nhKbZMxAzmqfpENVtdYa/RTE3hj/73n+tM+bccGg3szILpzMuiA/1Ljrq/sl4Pb 7yYfLgZCekLWkcjFenXnAHHeWpddxA4Y/WwlQpciSuTzY2+JYiAyffqXwpZ8n4xuFIzK GMqsHuMJKSmooHFH3R0b77L1L0g7bnfWer8qp/xZPDN3Wk9QCU3ZGTicBPAn2r42EgoD SVQP4iPvzjbFU4Bx4yAGn/Vt+spEiBfQ8kySjoPVvA+8tr0hiD6/WRZ5ys7n39ejENNJ qqfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:references:mime-version :in-reply-to:date:delivered-to; bh=RR+Vddq00evOpljglNa8g4PL6daH8y2RH9hQLR0NdBI=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=FuSg97MnT0G1Qs2Q0KrfADDeycKzSQlZ+bzDkU6FimSgrTrKGlYYPZK59xiXcnRs34 ZZMHYABpnskACJqZEoIorwmmqSwbzXY/ZGAdh6mfoTXt6hjrDtL6Oh5sP0Vl+VSKXupk KQsQtRl7/rBLyK+uAfqbov8A/mG7uzYeMKPR6SuVm9jr4dr0N+Ie2H0TbwajtOUD1/xo uQMfuayF37tvy5SeLxgUyO+ipaR+leDCiopx1gQUfEIFZ9pSD1uixhCGZXlqkJNRXlSW m83MqWSPh8M+xVNVWUhFSJrtVrW5q7BUWA+WL1jpvVyHTeBc0fJjYrzKMbWI4vq8EjCF GMyA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e5-20020a170906314500b00a46f99d910esi12013eje.634.2024.03.22.10.01.33; Fri, 22 Mar 2024 10:01:36 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8623468D57A; Fri, 22 Mar 2024 19:01:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B860968D4BC for ; Fri, 22 Mar 2024 19:01:16 +0200 (EET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dd0ae66422fso4533245276.0 for ; Fri, 22 Mar 2024 10:01:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126875; x=1711731675; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sLn7+27sMUjG5Z+y3Z6bI9LQObeEotTRxazW6x7SfPI=; b=nEH89OSBSXZlGk3AQUxyP9Cdgj41NBJVRBtLQ74rKOop1k5vDarNHCoQ5vYVJy0LAU P9CtFu1JJbhp48BTaN+meVYdfERHv44UxpPxdsruLn7LX2oe4uFc72JAxxrAGjIWiDi6 bKMxfSGU7MFVKGqOoMGUJq7ogKm7suaGrI3FWQQZjZVl3C4CLy/W9y//xi9oERBe57+y VWCqbDhWZgV7Z7Fb96CnZsmH+hfwhrmO0gMkq2NRXomrp7sPt2U/n1ogun1ylvga8pw6 dcGZHUAjHAS07Tqk7+FmTX80DvnCWOI0JZqIUBZZ+9em2O2JpC1fXYTlBabe4r21gAdD fOgA== X-Gm-Message-State: AOJu0Yx/1T5N5Qj4fELAEAC7D517JUepp4EA5ouAUQqLN9Ef12tbv5cZ 0qGUK4e9zu5hXA9gwHxRi7TNGT1/z05FSyrUvp6IS/GEPGSL6QrcH1JEwO+BQGqqvlxAxvTc8Ad o3PPBlVOeO3ddWdGFB6UhxNQXd8G2IoX1T6dAH7NqoSgRLUrRvuBAhA1NxS4qp975kx0bZNyPyf gScR/jcAqSoZ+80xGZJcKsT5adbmhyfNmrif2nmvpE72hX X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a25:1903:0:b0:dc6:deca:8122 with SMTP id 3-20020a251903000000b00dc6deca8122mr540170ybz.5.1711126874946; Fri, 22 Mar 2024 10:01:14 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:01 +0000 In-Reply-To: <20240322170106.2243608-1-asoulier@google.com> Mime-Version: 1.0 References: <20240322170106.2243608-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-2-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/6] avformat/lc3: Add file format for LC3/LC3plus transport 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: , X-Patchwork-Original-From: Antoine Soulier via ffmpeg-devel From: Antoine Soulier Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: u4Nu+/38cFr2 A file format is described in Bluetooth SIG LC3 and ETSI TS 103 634, for test purpose. This is the format implemented here. Signed-off-by: Antoine Soulier Signed-off-by: Antoine SOULIER --- libavformat/Makefile | 3 + libavformat/allformats.c | 3 + libavformat/lc3dec.c | 140 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 118 +++++++++++++++++++++++++++++++++ 4 files changed, 264 insertions(+) create mode 100644 libavformat/lc3dec.c create mode 100644 libavformat/lc3enc.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 94a949f555..29a38c1d94 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -332,6 +332,9 @@ OBJS-$(CONFIG_KVAG_DEMUXER) += kvag.o OBJS-$(CONFIG_KVAG_MUXER) += kvag.o rawenc.o OBJS-$(CONFIG_LAF_DEMUXER) += lafdec.o OBJS-$(CONFIG_LATM_MUXER) += latmenc.o rawenc.o +OBJS-$(CONFIG_LC3_DEMUXER) += lc3dec.o +OBJS-$(CONFIG_LC3_MUXER) += lc3enc.o +OBJS-$(CONFIG_LC3_PLUS_MUXER) += lc3enc.o OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o OBJS-$(CONFIG_LOAS_DEMUXER) += loasdec.o rawdec.o OBJS-$(CONFIG_LUODAT_DEMUXER) += luodatdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e15d0fa6d7..551b0f0d7b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -252,6 +252,9 @@ extern const FFInputFormat ff_kvag_demuxer; extern const FFOutputFormat ff_kvag_muxer; extern const FFInputFormat ff_laf_demuxer; extern const FFOutputFormat ff_latm_muxer; +extern const FFInputFormat ff_lc3_demuxer; +extern const FFOutputFormat ff_lc3_muxer; +extern const FFOutputFormat ff_lc3_plus_muxer; extern const FFInputFormat ff_lmlm4_demuxer; extern const FFInputFormat ff_loas_demuxer; extern const FFInputFormat ff_luodat_demuxer; diff --git a/libavformat/lc3dec.c b/libavformat/lc3dec.c new file mode 100644 index 0000000000..563384f786 --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,140 @@ +/* + * LC3 demuxer + * Copyright (C) 2024 Antoine Soulier + * + * 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 + */ + +/** + * @file + * Based on the file format specified by : + * + * - Bluetooth SIG - Low Complexity Communication Codec Test Suite + * https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=502301 + * 3.2.8.2 Reference LC3 Codec Bitstream Format + * + * - ETSI TI 103 634 V1.4.1 - Low Complexity Communication Codec plus + * https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_103634v010401p.pdf + * LC3plus conformance script package + */ + +#include + +#include "libavcodec/avcodec.h" +#include "libavcodec/packet.h" +#include "libavutil/intreadwrite.h" + +#include "avformat.h" +#include "avio.h" +#include "demux.h" +#include "internal.h" + +typedef struct LC3DemuxContext { + int frame_samples; + int64_t position; + int64_t length; +} LC3DemuxContext; + +static int lc3_read_header(AVFormatContext *s) +{ + LC3DemuxContext *lc3 = s->priv_data; + AVStream *st = NULL; + uint16_t tag, hdr_size; + uint16_t frame_us; + uint32_t length; + bool ep_mode, hr_mode; + int srate_hz, channels, bit_rate; + int num_extra_params, ret; + + tag = avio_rb16(s->pb); + hdr_size = avio_rl16(s->pb); + + if (tag != 0x1ccc || hdr_size < 9 * sizeof(uint16_t)) + return AVERROR_INVALIDDATA; + + num_extra_params = hdr_size / sizeof(uint16_t) - 9; + + srate_hz = avio_rl16(s->pb) * 100; + bit_rate = avio_rl16(s->pb) * 100; + channels = avio_rl16(s->pb); + frame_us = avio_rl16(s->pb) * 10; + ep_mode = avio_rl16(s->pb) != 0; + length = avio_rl32(s->pb); + hr_mode = num_extra_params >= 1 && avio_rl16(s->pb); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avpriv_set_pts_info(st, 32, 1, srate_hz); + st->duration = length; + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = frame_us <= 5000 || ep_mode || hr_mode ? + AV_CODEC_ID_LC3_PLUS : AV_CODEC_ID_LC3; + st->codecpar->sample_rate = srate_hz; + st->codecpar->bit_rate = bit_rate; + st->codecpar->ch_layout.nb_channels = channels; + + if ((ret = ff_alloc_extradata(st->codecpar, 6)) < 0) { + av_log(s, AV_LOG_ERROR, "Could not allocate extradata.\n"); + return ret; + } + + AV_WL16(st->codecpar->extradata + 0, frame_us); + AV_WL16(st->codecpar->extradata + 2, ep_mode); + AV_WL16(st->codecpar->extradata + 4, hr_mode); + + lc3->frame_samples = lc3_hr_frame_samples(hr_mode, frame_us, srate_hz); + lc3->position = 0; + lc3->length = st->duration + + lc3_hr_delay_samples(hr_mode, frame_us, srate_hz); + + return 0; +} + +static int lc3_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + LC3DemuxContext *lc3 = s->priv_data; + AVIOContext *pb = s->pb; + int ret; + + if ((ret = av_get_packet(s->pb, pkt, avio_rl16(pb))) < 0) + return ret; + + pkt->duration = lc3->frame_samples; + lc3->position += lc3->frame_samples; + if (lc3->position > lc3->length) { + pkt->duration -= lc3->position - lc3->length; + lc3->position = lc3->length; + } + + return 0; +} + +const FFInputFormat ff_lc3_demuxer = { + .p.name = "lc3", + .p.long_name = NULL_IF_CONFIG_SMALL( + "LC3 / LC3plus (Low Complexity Communication Codec)"), + .p.extensions = "lc3", + .p.flags = AVFMT_GENERIC_INDEX | + AVFMT_NOTIMESTAMPS | + AVFMT_NO_BYTE_SEEK, + .priv_data_size = sizeof(LC3DemuxContext), + .read_header = lc3_read_header, + .read_packet = lc3_read_packet, +}; diff --git a/libavformat/lc3enc.c b/libavformat/lc3enc.c new file mode 100644 index 0000000000..e6a9ddb35d --- /dev/null +++ b/libavformat/lc3enc.c @@ -0,0 +1,118 @@ +/* + * LC3 muxer + * Copyright (C) 2024 Antoine Soulier + * + * 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 + */ + +/** + * @file + * Based on the file format specified by : + * + * - Bluetooth SIG - Low Complexity Communication Codec Test Suite + * https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=502301 + * 3.2.8.2 Reference LC3 Codec Bitstream Format + * + * - ETSI TI 103 634 V1.4.1 - Low Complexity Communication Codec plus + * https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_103634v010401p.pdf + * LC3plus conformance script package + */ + +#include + +#include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" + +#include "avformat.h" +#include "avio.h" +#include "mux.h" +#include "internal.h" + +static av_cold int lc3_init(AVFormatContext *s) +{ + if (s->nb_streams != 1) { + av_log(s, AV_LOG_ERROR, "This muxer only supports a single stream.\n"); + return AVERROR(EINVAL); + } + + return 0; +} + +static int lc3_write_header(AVFormatContext *s) +{ + AVStream *st = s->streams[0]; + int channels = st->codecpar->ch_layout.nb_channels; + int srate_hz = st->codecpar->sample_rate; + int bit_rate = st->codecpar->bit_rate; + uint16_t frame_us = 10000; + bool ep_mode = false, hr_mode = false; + uint32_t nb_samples = av_rescale_q( + st->duration, st->time_base, (AVRational){ 1, srate_hz }); + + if (st->codecpar->extradata_size >= 2) + frame_us = AV_RL16(st->codecpar->extradata + 0); + if (st->codecpar->extradata_size >= 4) + ep_mode = AV_RL16(st->codecpar->extradata + 2); + if (st->codecpar->extradata_size >= 6) + hr_mode = AV_RL16(st->codecpar->extradata + 4); + + avio_wb16(s->pb, 0x1ccc); + avio_wl16(s->pb, (9 + hr_mode) * sizeof(uint16_t)); + avio_wl16(s->pb, srate_hz / 100); + avio_wl16(s->pb, bit_rate / 100); + avio_wl16(s->pb, channels); + avio_wl16(s->pb, frame_us / 10); + avio_wl16(s->pb, ep_mode); + avio_wl32(s->pb, nb_samples); + if (hr_mode) + avio_wl16(s->pb, hr_mode); + + return 0; +} + +static int lc3_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + avio_wl16(s->pb, pkt->size); + avio_write(s->pb, pkt->data, pkt->size); + return 0; +} + +const FFOutputFormat ff_lc3_muxer = { + .p.name = "lc3", + .p.long_name = NULL_IF_CONFIG_SMALL( + "LC3 (Low Complexity Communication Codec)"), + .p.extensions = "lc3", + .p.audio_codec = AV_CODEC_ID_LC3, + .p.video_codec = AV_CODEC_ID_NONE, + .p.flags = AVFMT_NOTIMESTAMPS, + .init = lc3_init, + .write_header = lc3_write_header, + .write_packet = lc3_write_packet, +}; + +const FFOutputFormat ff_lc3_plus_muxer = { + .p.name = "lc3_plus", + .p.long_name = NULL_IF_CONFIG_SMALL( + "LC3Plus (Low Complexity Communication Codec plus)"), + .p.extensions = "lc3", + .p.audio_codec = AV_CODEC_ID_LC3_PLUS, + .p.video_codec = AV_CODEC_ID_NONE, + .p.flags = AVFMT_NOTIMESTAMPS, + .init = lc3_init, + .write_header = lc3_write_header, + .write_packet = lc3_write_packet, +}; From patchwork Fri Mar 22 17:01:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47320 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp42274pzb; Fri, 22 Mar 2024 10:01:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWbPf5/0/TszIqW5OjtUrrQXgcAV3XYwX5INp86iyNsjeEgn0yK63Kd5lCr8/7ZQKOYq7pdq76Uo/s6ORBDkDxRB4EdrQJBMcrUA== X-Google-Smtp-Source: AGHT+IFWQOKUQCjqrmCXIrdSapS1SrZ4/PRuRPkbX/lruOFErBrfdNuL1q3NqDmYk+Hooo2n3yeZ X-Received: by 2002:a19:3844:0:b0:513:c5db:c770 with SMTP id d4-20020a193844000000b00513c5dbc770mr25905lfj.1.1711126904942; Fri, 22 Mar 2024 10:01:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126904; cv=none; d=google.com; s=arc-20160816; b=r1uBGlPAjrP8i4mEjb1JCJibcYwr0NEHdNw3yend7TxpuifL7mn6LZncYPay97u41M BFrWBH4mgQ/Me620LtF9WqzBR5Gh4P2mVSjfI9RwifotnxgrQwO2bKklogo83gEOJcdG KV0vhcMWD1I1f9Zj24vVrl+SGWofr70B3s4GsqIawPYki4Jrr8T/viQguqrC8CGJrIOt 5LAuJk3caNJlUCxBi0VNSfslgAXoVUDUTZGKt1dZdq+ob2peW5jZNPWHGGFrMaSnfVns S8O1wP9TdcEXXZE8Mkvdxr2nymZR3HCpOQ3vnz9TsTOo6w3gfN6dk6kl26eY7jEjRWDo Rs6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:references:mime-version :in-reply-to:date:delivered-to; bh=/8y5Aaieh+nKzJJ9saSIt2QgSI4hq7mxqSorUW13xqE=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=o20K7aStuHY5pGm4RtLx09jgzzy20LQZeH0zg5Tl8cs4lT5FH36uOZuoB7J5nAxyIr qovYSvM48mY+pS87SaXSa+TuSS//DwDJGQZQM9Xw1QPD7ZrDaYN8MvQY3JMQbs6KF+6G vmNBgdXUPx6bgJJA2CN4yW3x9W4FABvK0sTkfl29KneKJjbcFF3jLevCEKHK0CMMNV7L ukuJzxPZWjXQylKcfnyuWf1GixwZ/Gsf4QZhehrUx/HJvMcIKVxXhRQFEGFMwi6i1PV9 YtW1M7PYbFXVJ4jZsZCGQq5x0E1921Yu2OI97tQbTHzSCuDIBMuLK62Eprx4L3IMm+qV NnEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bq10-20020a170906d0ca00b00a45e1870f42si10836ejb.730.2024.03.22.10.01.44; Fri, 22 Mar 2024 10:01:44 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DB9B68D595; Fri, 22 Mar 2024 19:01:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6953A68D532 for ; Fri, 22 Mar 2024 19:01:18 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60a3bb05c9bso38732617b3.1 for ; Fri, 22 Mar 2024 10:01:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126877; x=1711731677; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=quRwK8xt0Gbdkhf0rMJI2FEGdxyT9W74RAZlHiSzw2k=; b=NykjT2h4K5Acp1qcY0thEYGjzj116+rlqex/D8S7UT17PhA7LCZfgEEBTDzcCiKivn 1MKJe3/7NEaZiUjuvQxFfEhlEIqfwoKyVkpwi/qrh6w1t8bQ/CBrR0KhlIckmsz2us27 r0xaJD4EKsii7JJXMyPmCnQMar0akZOn8WLL/F8g6qCoKoDn3rOpE+pOm3SEt09SbPsQ CYb/X2gujb9iZ2NVmhORBiYOLAYzqngLBuSswYPvLgr3IQQV7E8d/sCkk1K5Iv/2ONO3 mqrKmWp7D1A/EhAdSog3+ss2v+kmbArEAcaTMtMxE/ru8iSfIqx2DPSiebwaymuL/dsL HxEg== X-Gm-Message-State: AOJu0YyLwvYN+WlwQ28Bp4UP4WVVl19Bq1IRyU2+FcbcpT6zbeI0m5m/ KfDKgc2AMPkCRjkOWlq6TyJU47HESExl2hZYUHglb5GdKkX3TYqfur6rgr7q21Z9/95Hyv1gX1k hsUKlY8vDlRX0AiZEZio3zRRW2NYgf7wAFU/TkmpvuA2G/rEKCmPlk21gFM2NGE/Nzaa69aDrow sUpitUHFXXs4Y7h5IFN3N1vMNcNp7v9do0HEJ+FfXSk73f X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:2302:b0:dce:30f5:6bc5 with SMTP id do2-20020a056902230200b00dce30f56bc5mr101056ybb.4.1711126877090; Fri, 22 Mar 2024 10:01:17 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:02 +0000 In-Reply-To: <20240322170106.2243608-1-asoulier@google.com> Mime-Version: 1.0 References: <20240322170106.2243608-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-3-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/6] configure: Add option for enabling LC3/LC3plus wrapper 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: , X-Patchwork-Original-From: Antoine Soulier via ffmpeg-devel From: Antoine Soulier Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9fLPJ6ujhzit Signed-off-by: Antoine Soulier Signed-off-by: Antoine SOULIER --- configure | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure b/configure index 343edb38ab..eb8ff81a11 100755 --- a/configure +++ b/configure @@ -244,6 +244,7 @@ External library support: --enable-libjxl enable JPEG XL de/encoding via libjxl [no] --enable-libklvanc enable Kernel Labs VANC processing [no] --enable-libkvazaar enable HEVC encoding via libkvazaar [no] + --enable-liblc3 enable LC3 de/encoding via liblc3 [no] --enable-liblensfun enable lensfun lens correction [no] --enable-libmodplug enable ModPlug via libmodplug [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] @@ -1926,6 +1927,7 @@ EXTERNAL_LIBRARY_LIST=" libjxl libklvanc libkvazaar + liblc3 libmodplug libmp3lame libmysofa @@ -3501,6 +3503,10 @@ libilbc_encoder_deps="libilbc" libjxl_decoder_deps="libjxl libjxl_threads" libjxl_encoder_deps="libjxl libjxl_threads" libkvazaar_encoder_deps="libkvazaar" +liblc3_lc3_decoder_deps="liblc3" +liblc3_lc3plus_decoder_deps="liblc3" +liblc3_encoder_deps="liblc3" +liblc3_encoder_select="audio_frame_queue" libmodplug_demuxer_deps="libmodplug" libmp3lame_encoder_deps="libmp3lame" libmp3lame_encoder_select="audio_frame_queue mpegaudioheader" @@ -6858,6 +6864,7 @@ enabled libjxl && require_pkg_config libjxl "libjxl >= 0.7.0" jxl/dec require_pkg_config libjxl_threads "libjxl_threads >= 0.7.0" jxl/thread_parallel_runner.h JxlThreadParallelRunner enabled libklvanc && require libklvanc libklvanc/vanc.h klvanc_context_create -lklvanc enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 2.0.0" kvazaar.h kvz_api_get +enabled liblc3 && require_pkg_config liblc3 "lc3 >= 1.1.0" lc3.h lc3_hr_setup_encoder enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_db_create if enabled libmfx && enabled libvpl; then From patchwork Fri Mar 22 17:01:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47321 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp42436pzb; Fri, 22 Mar 2024 10:01:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVVkiXPH0Ec72n9Gv0IBN30PYKrk1ORLou64mhWSDzndb9sGs9DC9srYx0n3QRLkSi1obsdwxJtX7E7uJg2mpc6zrU1EG5BMCmJcg== X-Google-Smtp-Source: AGHT+IGYi80CH04DVmKjvZHjpfYDESfiE3rhmRVvCR7tdErlCXifgd9nxC5wDL9TR5mPL6ivO+26 X-Received: by 2002:a17:906:5651:b0:a47:e19:81c7 with SMTP id v17-20020a170906565100b00a470e1981c7mr227621ejr.21.1711126915079; Fri, 22 Mar 2024 10:01:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126915; cv=none; d=google.com; s=arc-20160816; b=IRqXINjGGXeOaXI2bin6JKo6vVtWPWsxfszu7XQzX0ob23ToJHip+H6cx7Bx+VF/uc w6ZofcUM20CHTeW9/nIOtfCMECjxAcvXG8sD28mWN8o187q1ZDq9KElYhwuX5fHGvZkh kQ1L3/Q0vWg8h4BpNuQnwxOn5AxdQgTI1KK0EbW7ghx8tMtxKLSb0XkvrRZbTo4T//cy Q4bT8fRfqLoR60Z+BsSf163yF/PY5nEB/F0eVtOLc0dgKfBAyPd9JWUPOrICiRMziBKv MjHdpVHpMsCw28WqTmP8BydqoBMzfnJOEEsSu4qvy/2D5Zz16kZcB7G6EBIj5AAU/3J0 iMqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:references:mime-version :in-reply-to:date:delivered-to; bh=hEhDC3XLg8omChZ2bp2ojy/FS51aL4WfgrIlTmHg6Bg=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=OxlSwnX4xx49rcOnnESuuFPPcCKnwE5OLTzGMd/VxTA1YTWqxnU+C5cdqRNyRp+ngf zFD0MwCTltBrqG30htpnzxV7GZ5WqsB3RrPLCguCMfJWJ4aAUTHwzaAMtoolccghO0fK eYmPIIMMmPGiiexJMSTHl4T/h6w0lJv48ohiaJCHt6ZW2ZWYizSliV2w9cyrnuWFGxru wtDbLnZP01DH5ZJhf0Dr1w8OpIApccCGvoqGcsiwVJLrwJdXwc7hOJKNY3zXq5XEP3O+ fOTrFdw2qBxt7FKUWRkB6kYpNvdRhcwUq9SaG9CLhOR2cD9TqsX3RdjR4BpVR8S/7lg7 6DYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz11-20020a170906cd0b00b00a4737a8d237si13974ejb.429.2024.03.22.10.01.54; Fri, 22 Mar 2024 10:01:55 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E07C68D5B6; Fri, 22 Mar 2024 19:01:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6346F68D583 for ; Fri, 22 Mar 2024 19:01:20 +0200 (EET) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60a03635590so46785767b3.0 for ; Fri, 22 Mar 2024 10:01:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126879; x=1711731679; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D0q+k+pGLdrQOIpZN7DAdogbdscKqBi42Dwt+mUlQoc=; b=H3ffIoGInO/f3OT7qtZOswLDugmOJxvEcM4NOnOg3+EvqU26GLTfC99Bv9sWnhwyYx x18LF2ckedZdNvHWW5rge8KpI73EMCZ2NkJ46XzlEfHXRGEeAdIfPsLwroeaKb3PEgb+ sn3P7qMDHGdH8C6NxPT0xK7zj6SB6rzz1b/6KIxAgOZx/qDsD/vqmhNA8jUjG9KchK0K LoCbS+QPPhxqLykgHV4mgVCM0RsdZ/xI9dpfXrKJhtk/EqzAFwbFdosOvZ9JSI+M7n0v 7vfO3kFc74hzb1ckOOo/LxH3fHLsgwUl+wpz442ciWg0XWW3I0DJ/4lCPZyB6A58ocPm ncVA== X-Gm-Message-State: AOJu0YwEn8d9Nlo+1arzxLquRZGpTrHI8vIgQBs+DvSiljYdUfQeYqhM vZGubYJgL8Vbj+itpFHJW2HcYMuQOhBS0tFJvYkVePkP1glAlV9Soba5ECL4BFoYgJEPaYxdspr 1g5JoOwf5O8A37qDYnqy6fffmeaJyW16iB9ApfM+jqwqslqK6ZgQjoHUELdzRn2YlaUTAb/BWz4 TUdIrKnAkMUwH2uELZQ3nxxfZ4AIqja+Zzt87bL+l4YaFh X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a0d:ea8a:0:b0:60c:c36d:1ea3 with SMTP id t132-20020a0dea8a000000b0060cc36d1ea3mr39558ywe.3.1711126879104; Fri, 22 Mar 2024 10:01:19 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:03 +0000 In-Reply-To: <20240322170106.2243608-1-asoulier@google.com> Mime-Version: 1.0 References: <20240322170106.2243608-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-4-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 4/6] doc: Add LC3/LC3plus muxer and encoder parameters documentation 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: , X-Patchwork-Original-From: Antoine Soulier via ffmpeg-devel From: Antoine Soulier Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JH/ycguffc7Y Signed-off-by: Antoine Soulier Signed-off-by: Antoine SOULIER --- doc/encoders.texi | 57 +++++++++++++++++++++++++++++++++++++++ doc/general_contents.texi | 12 ++++++++- doc/muxers.texi | 4 +++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 7c223ed74c..0719ba13cc 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -814,6 +814,63 @@ ffmpeg -i input.wav -c:a libfdk_aac -profile:a aac_he -b:a 64k output.m4a @end example @end itemize +@anchor{liblc3-enc} +@section liblc3 + +liblc3 LC3 (Low Complexity Communication Codec) encoder wrapper. + +Requires the presence of the liblc3 headers and library during configuration. +You need to explicitly configure the build with @code{--enable-liblc3}. + +This encoder has support for the Bluetooth SIG LC3 codec for the LE Audio +protocol, and the following features of LC3plus: +@itemize @minus +@item +Frame duration of 2.5 and 5ms. +@item +High-Resolution mode, 48 KHz, and 96 kHz sampling rates. +@end itemize + +For more information see the liblc3 project at +@url{https://github.com/google/liblc3}. + +@subsection Options + +The following options are mapped on the shared FFmpeg codec options. + +@table @option +@item b +Set the bit rate in bits/s. This will determine the fixed size of the encoded +frames, for a selected frame duration. + +@item ar +Set the audio sampling rate (in Hz). + +@item channels +Set the number of audio channels. + +@item frame_duration +Set the audio frame duration in milliseconds. Default value is 10ms. +Allowed frame durations are 2.5ms, 5ms, 7.5ms and 10ms. +LC3 (Bluetooth LE Audio), allows 7.5ms and 10ms; and LC3plus 2.5ms, 5ms +and 10ms. + +The 10ms frame duration is available in LC3 and LC3 plus standard. +In this mode, the produced bitstream can be referenced either as LC3 or LC3plus. + +@item high_resolution +Enable the high-resolution mode if set to 1. The high-resolution mode is +available with all LC3plus frame durations and for a sampling rate 48 KHz, +and 96 KHz. + +The encoder automatically turns off this mode at lower sampling rates and +activates it at 96 KHz. + +This mode should be preferred at high bitrates. In this mode, the audio +bandwidth is always up to the Nyquist frequency, compared to LC3 at 48 KHz, +which limits the bandwidth to 20 KHz. +@end table + @anchor{libmp3lame} @section libmp3lame diff --git a/doc/general_contents.texi b/doc/general_contents.texi index f269cbd1a9..9e340fce7b 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -237,6 +237,14 @@ Go to @url{http://sourceforge.net/projects/opencore-amr/} and follow the instructions for installing the library. Then pass @code{--enable-libfdk-aac} to configure to enable it. +@subsection LC3 library + +FFmpeg can make use of the Google LC3 library for LC3 decoding & encoding. + +Go to @url{https://github.com/google/liblc3/} and follow the instructions for +installing the library. +Then pass @code{--enable-liblc3} to configure to enable it. + @section OpenH264 FFmpeg can make use of the OpenH264 library for H.264 decoding and encoding. @@ -1300,7 +1308,9 @@ following image formats are supported: @tab encoding and decoding supported through external library libilbc @item IMC (Intel Music Coder) @tab @tab X @item Interplay ACM @tab @tab X -@item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X +@item LC3 @tab E @tab E + @tab supported through external library liblc3 +@item LC3plus @tab E @tab E @item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X @item Marian's A-pac audio @tab @tab X @item MI-SC4 (Micronas SC-4 Audio) @tab @tab X diff --git a/doc/muxers.texi b/doc/muxers.texi index d9dd72e613..43dabe4499 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -132,6 +132,10 @@ to Annex B syntax if it's in length-prefixed mode. ITU-T H.265 / MPEG-H Part 2 HEVC video. Bitstream shall be converted to Annex B syntax if it's in length-prefixed mode. +@item lc3 @emph{audio} (lc3) +Bluetooth SIG Low Complexity Communication Codec audio. +ETSI TS 103 634 Low Complexity Communication Codec plus (LC3plus). + @item m4v @emph{video} MPEG-4 Part 2 video From patchwork Fri Mar 22 17:01:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp42690pzb; Fri, 22 Mar 2024 10:02:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWGUWdm/qtjdWxSMbldO5WDocCTQHvwsocfYkoU5Pyaxt/J3/3REcVVqQ4GadkU+qhZRvkpg5/lQ38TyGNeAyZa5QWXtK7uPFB5LQ== X-Google-Smtp-Source: AGHT+IF/J/b7j95H1BcTT4eDZTrTjw1Ex/RzDocoD9bq5F+3lBHN7x5tMvpnEuXy7qajkCMUxoiI X-Received: by 2002:a19:4317:0:b0:513:ba98:36a with SMTP id q23-20020a194317000000b00513ba98036amr24006lfa.10.1711126929687; Fri, 22 Mar 2024 10:02:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126929; cv=none; d=google.com; s=arc-20160816; b=RlxoX5sKic6sLOkTcjCnEckaRSTB/fxMppk3cy+lPW+/2OfEz5K7Rn+yJFMDnk6Epc 0z4QY6dm1RgH9bjDfb0/JqY0fW1CPbTaELeLCTDPJvR9PW1eIpuIlAN6kePzVeE9gQ2Z Yh2fazjlDfqrroz4UCxoxJDUm0ygf2JJ509nrArvfsVflk7HWBj8Yl9kSvJDctnTwGkU /xIgKvhB95sxa3EE0AiMDAKQIO+sdlnQCUTpQue/tYDrbw9P45DkUcUTSiAJD8QqpKcG rRjauiuy9ahyLbnaWXhNHhpEl1dqgMPEYnRKVS5XMgSFtg6R0k8JPC9Ws5FHJfua+HyG ZyWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:references:mime-version :in-reply-to:date:delivered-to; bh=YB9vG1hvKr4cbK0XsKrT/pqWfGHlIlnAoQiNk6hxA3E=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=fcscCOr11CoO4dhlKqnGhSLyi3wxJNOm7P5zRUZ8sPuQTpqsnIzFA8Luei1zJFtQCl vT/hqV1Y7aCz4llgiw/YOP2f4Lp7Wt6qqbE4lNXB3cKWm1f3ADlNdUBUi41ysGU1i0Rk d5IEH4BlSBYZ3XD2nKJxqSoxA6jabRkLf4OFmdUykNa4HNwclP0m3di3IWEDddI+HuC0 PbY5QqnuGSN99Vpnpm+3GXhbzV/k4tYIFsqy46NL8u8Q7/ZU73/uHWmnrIHdEjwt4zKA VeeTYbbmlC/9hcYOnHXr3UMhYtQXt75TReV0jx1uvoZS1WHvwJwD38a9HruV7AFIDkjG y4bw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ky4-20020a170907778400b00a46d6738185si11230ejc.876.2024.03.22.10.02.05; Fri, 22 Mar 2024 10:02:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B638068D5C4; Fri, 22 Mar 2024 19:01:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7420368D5AE for ; Fri, 22 Mar 2024 19:01:22 +0200 (EET) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60cd62fa1f9so37480927b3.0 for ; Fri, 22 Mar 2024 10:01:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126881; x=1711731681; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jSdPH7gaijKC4VPwYEkbIkz1A+oFRNI6W9HgVaLIqN4=; b=fjj99m5w1zgBYKGtWANiXRsh4mY64UXfjNY5QBsCfSFTyeuW/MXnscjq7bCt2uKZdy yR5vEQfeO/XVjj1TKKRuWKRe9RDVeF1qmPbYfJVqkUgtBb5x0JHa5PKtXAqtASdTb60b tOEJfpOL9qN3vqjoZq2c/0y/e4diGQW0u9qFRS31DcZ9dOr6TaWUQKY6p65d13YlXThe GFhGHc/UYu/cY3cWQbxnyPpbLm6X8i5lQjVyoWZ4xxu98VTYCNOKj/jARNulymy/s3kj FATa7dqGhat06hgCGm89V63AZ8s/5hX+pUjYes8YMzL6mq/DQlhiAK/bDMapa2gnv4Ed ziIg== X-Gm-Message-State: AOJu0YwXh3DwYDIWEyUT50llWXzy8ILKaeN0uw98lyDzQRjsVxhWXSMa C5YeQDsX058c0nhXurg3lwsB3sUuuai+h6GupGEJGMuQX9sn1yRS+PYSQru5Q71AXxg2aeYkqAo uopaa0ruY4zUrurA1jvBXqTNYucx9RWtptASli9FiIMDhV48o/m4n55vujVJSSN8nZUYKAhWsVJ kI0i8VCnvQNCIEXAhNc5toccafRHBmFDFX0skQOaplYW4x X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:1001:b0:dcc:4785:b51e with SMTP id w1-20020a056902100100b00dcc4785b51emr101253ybt.12.1711126881094; Fri, 22 Mar 2024 10:01:21 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:04 +0000 In-Reply-To: <20240322170106.2243608-1-asoulier@google.com> Mime-Version: 1.0 References: <20240322170106.2243608-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-5-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 5/6] Changelog: Add LC3/LC3plus decoding/encoding support 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: , X-Patchwork-Original-From: Antoine Soulier via ffmpeg-devel From: Antoine Soulier Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DffDWkvw5b7f Signed-off-by: Antoine Soulier Signed-off-by: Antoine SOULIER --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index c6e8f6bcaf..fb08ee2f81 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version : +- LC3/LC3plus decoding/encoding using external library liblc3 - DXV DXT1 encoder - LEAD MCMP decoder - EVC decoding using external library libxevd From patchwork Fri Mar 22 17:01:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp42849pzb; Fri, 22 Mar 2024 10:02:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU68ltCViBUi2VAX5l9Xl/8lV3bqZWmyv5k4QWm6XQ903gW/49ETnoPPZBC19EUjiTAuIeDvj8C+QN9phx5wOl3zR3COuIFMNL6Mw== X-Google-Smtp-Source: AGHT+IHy6HGM6osKjVuBFuCd0PRkz2OJd2aryCqewJXvw/2sc9BNInSKUzRc8g2DZ3ethfVqU6wA X-Received: by 2002:a17:906:2351:b0:a47:1d8f:c1ae with SMTP id m17-20020a170906235100b00a471d8fc1aemr235863eja.41.1711126938871; Fri, 22 Mar 2024 10:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126938; cv=none; d=google.com; s=arc-20160816; b=dNvL8LS46qXleax0ivjRIU2joANx/BTMCKrBzZSUpLU7G51yHH9ONPFTvyi4mDblsh +cpWdUrVKGSmuQ967pNX3c4eH+V1mnbyKaPS9Ua/A5NDNHfl4cZ9DygsPMpw/zdKgbjY FIjjCIR3t7WLmLFM25Ypf4WjrNR26oWgEIwOmEdk+8V/2yYNtCFAtGgnuNvIsvTxUliC y5FO6bVfhsfK3T74r9ZcgP70stONSFIT/Y624uBaq7H+LXCRl71MXGGU49Ys+XLYjQVi g6nNID01he6xUpRYqAtTDmx92Nc3ro+A57P2ZO/82JHE6pc5fM6lH0Hkmd090pxNNbvQ Wswg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:references:mime-version :in-reply-to:date:delivered-to; bh=6Mh/7KUb4RAvsj1XJwgbrOgTYN/JwWZXLiene4+MxT0=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=ZL4CiZKOl+QFbkHFpMZFxTAkMH4OeKi0sKnb4gPPBlLqnuYFv2I7p40WeUpi2skt/1 2zZt3tfOCbFDH3Re8d7P9Zftl06Xv2CVACFVnqc+rfW9EHSo4a0L9X7P8WzyFQfg0rCP 3NVa5ELB7uw6+1oVxjp7MHc//ynjs2B6SZwALdBJZEe37f2o10UpUSwrjpj91KuD4QKU vmH0PY0d8sPTI2Mm3g8pGcTYArMkKnX8Nw//BzXDY3CZzLhDIttSSySPOffk3v4JIJPa IRIEZbbvlU8vUEsd9kwMh0qedOYvhf4yxTCzpYauKVtRkLK5DmqiJLyQvMgJsUaPsMbc j6vQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u27-20020a1709060b1b00b00a46decc3220si11158ejg.791.2024.03.22.10.02.14; Fri, 22 Mar 2024 10:02:18 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B596E68D4E8; Fri, 22 Mar 2024 19:01:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77C9A68D598 for ; Fri, 22 Mar 2024 19:01:25 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60a54004e9fso42444287b3.3 for ; Fri, 22 Mar 2024 10:01:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126884; x=1711731684; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=4rg7uIyu7w7OG7ReMmIB19IqdC4qS1AyKxU3GP7ba1g=; b=K1QK0gHhLrTZltovedRm4KeK3QLnePPzvBB0Mi14TQrbTI8fH4IXcZXW9Ew2r/sxC/ 1RZAPPC2i05kjtXzBSPmjonE0jvpdTYdXfCcJHYtvR5ZBllQjr7XJbHWHgNrsjsdurWx adLjo9wbGhl65QMVpuH/e5e2olKvVQA0ozO48hmRdMcZNPe+bDouX0Y66Ois6UNtnDHE rPCZhfBXjkGYt0/ZJ1Rvxk8xXZifaTbMTcePgBRD3Jki56e8el3Knql0FHzAvyXpaTae +SUyL53ZWP+wjDyvNIjbPzqYUgHESLAMgsZjqO1Wo4UtHIenw3Tgy5JeCmcPiEkerdHk FEEg== X-Gm-Message-State: AOJu0Yx3HlB6Q3YoZ/HfvNEAPzgqDEO50kkCjBu5ahfQrRo/GPv1ghSD AlvR5TgV1MFCuUrR2HyXDXcfCntvumII0Y4yiFJn3shF98DVpaoom09KeruBnFig/M9QqxLxw6E yqfxVJtCIsgAsij32ofv7fSZwDIYIr0TMiBJhqYXyKNEycxr7O6q5DX8UtD9j8fKja2cej3Q7r6 MfXKSEko04bGh3/EW8x5h5YdTuqF3oHEg/9Xcbqu1Z0+Xb X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a0d:ea8a:0:b0:60c:c36d:1ea3 with SMTP id t132-20020a0dea8a000000b0060cc36d1ea3mr39631ywe.3.1711126884199; Fri, 22 Mar 2024 10:01:24 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:05 +0000 In-Reply-To: <20240322170106.2243608-1-asoulier@google.com> Mime-Version: 1.0 References: <20240322170106.2243608-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-6-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 6/6] MAINTAINERS: Add maintainer for LC3 audio codec wrapper 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: , X-Patchwork-Original-From: Antoine Soulier via ffmpeg-devel From: Antoine Soulier Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OkP00lOQvfgm Signed-off-by: Antoine Soulier Signed-off-by: Antoine SOULIER --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index dd633f37e8..d07512fc0c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -188,6 +188,7 @@ Codecs: libdavs2.c Huiwen Ren libjxl*.c, libjxl.h Leo Izen libgsm.c Michel Bardiaux + liblc3* Antoine Soulier libkvazaar.c Arttu Ylä-Outinen libopenh264enc.c Martin Storsjo, Linjie Fu libopenjpeg.c Jaikrishnan Menon @@ -393,6 +394,7 @@ Muxers/Demuxers: jpegxl* Leo Izen jvdec.c Peter Ross kvag.c Zane van Iperen + lc3* Antoine Soulier libmodplug.c Clément Bœsch libopenmpt.c Josh de Kock lmlm4.c Ivo van Poorten