From patchwork Tue Mar 26 16:47:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47495 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp81397pzb; Tue, 26 Mar 2024 09:48:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgIIfH1i71Hy5Q9peROM1CStyAcOgEWTJJkmwiL/tsGg62OjrT0p2sCisZCPKgJKujh5s8+0bLpXRCrS1xniv6J7W02ycnCPLsVg== X-Google-Smtp-Source: AGHT+IEv/RVbKZZgaCG+Oe8LHCPiMQNoM7dNkorWNiKpl400X2FrjtENo4KkO+5zlGJuInUGHf+u X-Received: by 2002:a17:907:26cb:b0:a48:56b2:da0a with SMTP id bp11-20020a17090726cb00b00a4856b2da0amr5390347ejc.5.1711471704902; Tue, 26 Mar 2024 09:48:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711471704; cv=none; d=google.com; s=arc-20160816; b=fW4tKLkO2kEIZfLILN+1eS+KQb9Yc4rcMw4xGtQEX0fQjI/l+MaHbgKncs1AEWlwo/ 5MaOaVdqNfymC0XFvuT3jnkpOtJ4ahZxcQvjbO7D6LIC+iAP9wdQcvvyN7ASPXegFgZa WS2Ng3vXZp/TUrdRSGsl+4sohj8nMEwj/P1hkQooxNB8f9/oHfm4Nrc6+bUIPSyCwtGH bcJLGsCSfYvSRrzCWS+QF81vDmbXzx5JNynJbsM5ES9Ne57lgDiQIOMFRLo6KdICBC7j XGqgftyikh8AlSoxkw62KRml7qoLjaC7Oagy0SXGH/9/qEdIcbkzvs2ucLq8Rx5m70Wp f1Iw== 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=/8y5Aaieh+nKzJJ9saSIt2QgSI4hq7mxqSorUW13xqE=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=H8WvOFZPTPIq6koUoFwBzkQNZS3oTfWf9f+1EpnsU+dNWI+RqQZOWh+1qxDhc4LIIy CyEV6GK/vQAzjrAJqQqvovCXLU2GQw3SeszD7qXxyZAsMkoVYq5usIKslh52WQWkKPsI WwiaMyd8LsZepaCVYOx30dThO/QnctI2Y/TYaObl33MkD6sdX2iiViD9FAjSl4hv21O6 Zod6K3Vs2v2J4n4L4MlkFqo3bzoHWu0U345+Pecu17mzDt6sdoUdoVq0GNJI2ldVK8jh qeOEzXT7R/twRIJlZZgto86osZGIbvnHRJj7+Hnsn64ImYXgSY00xcdUsXlot63wn5H6 32RA==; 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 o12-20020a170906600c00b00a474884c967si2939756ejj.472.2024.03.26.09.47.54; Tue, 26 Mar 2024 09:48:24 -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 C8F3D68D615; Tue, 26 Mar 2024 18:47:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADE0D68D4D2 for ; Tue, 26 Mar 2024 18:47:44 +0200 (EET) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc64f63d768so9548739276.2 for ; Tue, 26 Mar 2024 09:47:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711471663; x=1712076463; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=quRwK8xt0Gbdkhf0rMJI2FEGdxyT9W74RAZlHiSzw2k=; b=p/nIr1q2CUM66w8RoDGhJn9TdjWuFxPKtLl3bfucZ/nQv8vkwLUkCo1JEYUARxR8Yb l9LShBZ4ap7pHY17eOi2UYTpDjXaanACkWhQBUSTUB1yK4yCooPixyBy1HPyKC0ww6h8 L+S2Mz4FXuOTnK7pnVI39YxESXbNZOPtfZi8coFsYWrl3JHqeTCrzFHK1Imcn4T0ND10 PvMkLvFKPOOr8tLKmvm704cLu70X84LItQXyVWnNpJUD7LlGnta61qq5tHzzPmtqNXUC D+zWuVIC7MkGX/yznm4nr/HoUoPkCUtAv0b6CoKRh8ZPLwmKB84tKdt4cIzMmEnsc8f5 PMVw== X-Gm-Message-State: AOJu0Yw1+a11xwCyIE7mwxfrwCHfzJ7c/0AhnXmvRYfkvKHr2GShFKu5 NtxT59mocfERVdgKCLHZ8f+QCm6Hc3AgBde1o2lPc83lggaUh8ztqGAeNrsac+eCSqfxi1B1sh/ mzS3Jnwu8QIv3ZESQV1qQ45AuSStuL4goSH5ComW9NJR+UF+CEmxBpeMj9jiyxSxUuRK2vFXlgm B+JhwT1sm7syOYMbqZ94quj5OYjLbjU1JVjK6FI15DbGEx X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:2601:b0:dc6:fa35:b42 with SMTP id dw1-20020a056902260100b00dc6fa350b42mr3191178ybb.2.1711471662990; Tue, 26 Mar 2024 09:47:42 -0700 (PDT) Date: Tue, 26 Mar 2024 16:47:35 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326164739.153011-1-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/5] 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: OcyHh9QOB1ia 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 Tue Mar 26 16:47:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47496 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp81474pzb; Tue, 26 Mar 2024 09:48:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4p6zkbwkZQmL6Yt4fHfDfpp+4Eyja7MurGCQt6xVe1+vwyijJAqALuGhlyGSQJTa1y3fs5XpXq6PFTWHVlplJq11yD5CkPt3Tww== X-Google-Smtp-Source: AGHT+IF2QGLAjNT8cGj3m+g99jo+u8ReVt4qCTrOFoaelwf27qjS3PO2rSy4HJKPr30/Y7r/R40a X-Received: by 2002:a50:d517:0:b0:56b:b0f9:b7fa with SMTP id u23-20020a50d517000000b0056bb0f9b7famr7900960edi.2.1711471714074; Tue, 26 Mar 2024 09:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711471714; cv=none; d=google.com; s=arc-20160816; b=ZbwzGjS2LWJ9nycKpbqKFUYP2a1o+v2RrvcEUIP2wvGyooPoo9iP6oQNZb+Ryctr8D q4Zaz4MoPthA92K/lbQJu6WN/96IvQ1zlJg2ayWWHggPZDWJqT/WNG4O25pyLvfLDv6+ dnSNQgcIRIherfW6flpkjLRhaGX8Qhcy9aORvwB4uzP/0i5sVyIFTwG39XzRKwh2TCx+ eqDz6TpzmcCibNGfyrDVyhlua5M9PuP/6rMoNHeIHf2U4L5xU53TIL8021RdoNmkgZef dI/HpzdVLZhDYxPbUGX54ooIhNCvd140PclOmeDL/JtxkFIzJI486t6rvwfLamm5Lf2O SP3w== 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=XXy8w88hAx+TcFUYGoK6hAg4rKlZYyzBam+iO7kNuSw=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=enXyI4fTImW3dkx3jFzS9a+QbR4oP6QZD+hrBjNNWkvBBWAZcJs7WfQR+qNCQmQeFo dxcJs3SkaXV/rMJqQtNZn6EhZwtm9g2csv8TwSK/gYPndaxT2Oq29i3SVHv1HQjg404H GL++uSn5FFWbgHiIqqi+e2b2MGr3uNUnAJ8+LUMbTklsOvEHrgggiN2mtZ5jZwZVpdcx 67a5KyIGI2PTjstBDTaRQuDUR11Q4CIrsQs51+e93CwInaXjg2lp0+Mf1b+EUT6AIs/6 SUbZxx9wgWIgPk+ZnOyuEPiX/HDOyXrKcp7uS6eFcQlEJ1gxkFD+xEhpL7bWAfBZ4TMi jW9g==; 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 eb13-20020a0564020d0d00b0056ba005a4bdsi3678410edb.288.2024.03.26.09.48.04; Tue, 26 Mar 2024 09:48:34 -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 D8F7D68D61F; Tue, 26 Mar 2024 18:47:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E25068D431 for ; Tue, 26 Mar 2024 18:47:46 +0200 (EET) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dd8e82dd47eso7864367276.2 for ; Tue, 26 Mar 2024 09:47:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711471665; x=1712076465; 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=fNHhSgiP0yvN0gOku38TamTG5zPZBHWgJMsHhHGOkEE=; b=PjiJRNyiX3zhvZwDVMSbbM7nDwNS4+v3PHzko5SWreJ5rd6wIWM4+Nj999iUcf4z0E UJaxb+gxaN/diQT/EPbNx13SFL++YwaJbfaU1xh5HU7W0brMPJl309zcv2NDSay4Vyn4 1AgmYmaq/y1sDHJSTa0HB9+Tn8wsNwThs9AqcnVcLUYL+BJk7CiIe5r+lTyTQjNcAUQW xE6ysjpqjO+DiqoXApdQNKya6QiWktPkZfxTbaW4nOv3sK2ze+uLaas9qocvYuDLWQr6 RG94AFqqBzsnJgG2YsO2QNkP56GqNakuZwyG1nhj09BX9Cnga6Hc//mhacxboFmHhhKO 4d6w== X-Gm-Message-State: AOJu0YywbHOUCykHiMvvCr0pWoGPHOsFjkI5c9oAiDDNsXKAE74+LCij zb6pV6fIy3FoTGxWU6PxVVI9g7fPsoM/MS2qwkUIzS7R1UmLwNCcmP4G72RNEoQRDlN3QBNgHpv XmThvjz3Mlozy4Et707yWNlPw9wbP5j0wL0H6ZMDzcU7Oq2B8Vb4fyFW8Lnqr3XdiCF+CLQldp6 NHsMQazUkdee0k3NgG1VSRMjlsluXLUxqM/UEp+36HpsRa X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:110d:b0:dcd:2f3e:4d18 with SMTP id o13-20020a056902110d00b00dcd2f3e4d18mr551674ybu.12.1711471664787; Tue, 26 Mar 2024 09:47:44 -0700 (PDT) Date: Tue, 26 Mar 2024 16:47:36 +0000 In-Reply-To: <20240326164739.153011-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326164739.153011-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326164739.153011-2-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [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: , 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: iseuyz4ZN+sL 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 Tue Mar 26 16:47:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47494 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp81390pzb; Tue, 26 Mar 2024 09:48:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUglf94SAhjsGVrrUOkhqL8uil87mv696OHbJISy601aOpSnfCgJzaXlltU1D9NTMPe8xbDCiH3hawU0URA98oaphXNvtCoA8NiYA== X-Google-Smtp-Source: AGHT+IG5/Pd1qZ1zPC5jLLtGacLlDML9V3xIn1ZDPfvppUB0CzmY8B62PbU4S3j4s5+yjmo1MvjN X-Received: by 2002:a17:906:b351:b0:a47:a340:c9c1 with SMTP id cd17-20020a170906b35100b00a47a340c9c1mr1380777ejb.27.1711471703991; Tue, 26 Mar 2024 09:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711471703; cv=none; d=google.com; s=arc-20160816; b=jSDmD70ifVK5EQ21sRbRciXP5Kn91mt9tVdOy4x0tx0WrQu+AZO1r4HYg55LbrWQDG BXen1ykz1TtTQWlTzwq9ojp2TH2C8zeunHKtko5NHMTV/xwOhKJAW6UK3zklNyLUM7Pv 53Y/4EIXObFooa4wxtioeXeQhPZviKqEGZpYX/ODgmlcVtZlHNP5IF4G6/e3IfAsFgyn EvLJgWsnTSdTQ8glQIeaGOU6GQ1C/e+y5EmZchscmURksNs9Y6r831t9S/4pYCr0D9GJ O9ufEABUw9hfCu5KKcTwmtevJHxIBSjQI0r6RD5iJ3LV22hQc0kRuPjqj+y0kCQt9mO/ Vh/A== 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=pzmvvOH0DUIcBKAuL1bjvlxFmANPf1JQ1SokF1XmdB6etQNhClM6SrFXqEwP9vjhEj KGBk/vIxGd5voyr6EtaSDhKB46E2f9ZwHAaepC+gdxoFpMrWFb4C3KeVtUWSNLNMCOjl OPNmw+5lhoPa+g26RbHCxSn4ZfkrWLYUmLmADjWwR9SyoOeUtTCDtnXYtgivpXTG7UWX z1CEYRuKwYLJWyTVTe8AQg0Kaxz/PA9nsUgUD3P6Oyqkt5evIYbdKrC0IYy5AOFNQFVe g+39irAVN5123fx3OfL/w86ZfBlGxm4hDhg+SgikOwcopswWk67T5nrYsLKmJoHCe9o9 E3FA==; 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 nc18-20020a1709071c1200b00a4a34123992si2209542ejc.165.2024.03.26.09.48.15; Tue, 26 Mar 2024 09:48:23 -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 0A4C968D626; Tue, 26 Mar 2024 18:47:55 +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 A739B68D55A for ; Tue, 26 Mar 2024 18:47:47 +0200 (EET) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60a0a5bf550so109876677b3.3 for ; Tue, 26 Mar 2024 09:47:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711471666; x=1712076466; 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=rMDvAhYmTJ1FSA+mc58dHIxAAJtgC1YodMz+tVSUkINFtDhxRELHproc9+uNF+YDeN rKr9HwDY2TnIeOzgloqlKvHfgtI9T4SvazoLEXfEbU3+p0deJjdICvXMKw2MRsm0IDS4 EFO2OIU9wd4i2AXzrohbQTljIUJosrI9dCqeS8EU9e9WwMOST2qc3Tq1CVJ31HtQqIsV 3X0rS1/gr90eWWAPVo5zxxHeTwYFbdmXbG0zn2W5kiS7Z5w6M8400GzlmOF8v2Y5ldWj p7ZH4hjRvOALf84fOn3atVbY9FFmiuesfMf1tGpMwvMn4Wc4SZJbN86xlVqXZTRq6sWl 9qnA== X-Gm-Message-State: AOJu0Yzfj/H+zddtJm5bn1ukzsbYUm/H8NSNFyEEs4k6HxEt+3vGy1q+ 8ornvh4lYSkZN89CJmVnLm3+ktRX7UQ4k3xe2RFhWpj7A6d3Q3vJ2AYL4ilmmhYipo6v/tUlKcp c6jRAQex9V12FJvNw8rSjJO2niI2rlkDoGIM0rh5sNjkrKcbV7ucArGqV4xvPjSLMl4E/PH+Ue8 vRF3BJ1FOuUmIZh/8pHvDLoaDHGTr9aVd4crt6Ho4rmjaz X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a0d:ebc8:0:b0:609:25d1:ea9a with SMTP id u191-20020a0debc8000000b0060925d1ea9amr2770452ywe.9.1711471666144; Tue, 26 Mar 2024 09:47:46 -0700 (PDT) Date: Tue, 26 Mar 2024 16:47:37 +0000 In-Reply-To: <20240326164739.153011-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326164739.153011-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326164739.153011-3-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/5] 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: Q9Jwn2e0z9SR 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 Tue Mar 26 16:47:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp81683pzb; Tue, 26 Mar 2024 09:48:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVfwu9JrextdvbNXTWKLrkfaNsmcHUJsv9nB6Qmf0rPShh3VACoSLSsk03BvHbc7HUo8OPPRpEnHL1vd01nlyDk3oEoSAnr56Q0hQ== X-Google-Smtp-Source: AGHT+IEj3uxSv7v4qBZmFlEWgB+fmJOGz8lfEGPdeyO+03ilaB0JQsmu5zZ+TbqE4P+y+gS4jFp5 X-Received: by 2002:a50:baad:0:b0:56b:a969:e752 with SMTP id x42-20020a50baad000000b0056ba969e752mr7217138ede.1.1711471737006; Tue, 26 Mar 2024 09:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711471736; cv=none; d=google.com; s=arc-20160816; b=N0pFbMieQtbFO/mKBYkZxjHjMQ2HuuJIFm17ivwiISj/oi6O64qSRUvNlnBZITcRpX gFjfVdI0g0sOzAAB3+Kzht3Ho6EJ+q8aG6+PpZ0gOI8+oc3/kDhJi/0bZsiwN57QhRck CrumLJb5ogP9NDb4qenc6kfZBlQIvRtWLaV0JiXhhrU0LDtYAxjzWJvMnWd8grQmmKmM FCEZnPTefdof+1T9a8Xiwxsx4rkz1DY0zzQPX2o2wE+wc8PQyCpxQ1k/EfG8vGbG+hGG F/Lu7af3jVFPu2oqxnXclvBCXLywcVj71JAKjnlzvPl5+4SagyqWKYBQHgJznNkAQCBe fPdw== 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=x0uYRNWSF7DJrlun7zRaFJycFsgH2O5M4B//SLMuCC6/HNmn+3l+ip2szsTIejy84O vKT7JbdiX1jXJuoUjpoyZt4J6RFkpQJ0vIUZAFREt4Ivpd97AKj+QpP1Ai3G+fbrCMGj hcove2nE1Hb19MLGecnj9Fe0VCD54fTH/ZktQ2VB3rOBHDDl0J/WAqCLo+89mkcMZTDw cnptrbioEsRVd8hyOhbbktYC2irscB+69jXQve2kR/vVAj95f7LtNKYtJredLxxBlAqk Pkzd0jTtZ1fy4exhTqxAAN5f0Lv7RL+wRF+Plcr8yeP9PGfOKX8zspNMCsIqCxHerelW N5NA==; 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 j28-20020a508a9c000000b0056be89faa0bsi3769007edj.458.2024.03.26.09.48.27; Tue, 26 Mar 2024 09:48:56 -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 110AE68D639; Tue, 26 Mar 2024 18:47:57 +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 5556168D621 for ; Tue, 26 Mar 2024 18:47:49 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60ab69a9e6fso83428377b3.0 for ; Tue, 26 Mar 2024 09:47:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711471668; x=1712076468; 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=Ur7oKIxx1OHUEcRF6B/+OF4IQGT2+c0f1RNshLiBMC0ZapRvf8ICiYRbPJcLhBxAsF J7wLPGIMIWmE2j3U8DA1sfopfa2pCKKEYZ2WzHnybfEKUMuD99CHbM3fUg34YLe5DOCk HGxekQoHt7e6Ix0BwwUVrshTHhhi8wk0UZb5bDRWlu0Zo1hSUzT/my8Rwq+MMMCzeDEw kzoLvsUSvnF0ijubm2hksHRT7bjWCuIORY10/jp+kwlQmoJ4MB7ghi/BoCqri19JrZj6 e5rdyWI24WMs2EGh7oKdfIA2lE0m305uLwxntWEcivAR3ZSXVzInBy6Z4Ra7v0Wwspxc dcZw== X-Gm-Message-State: AOJu0Yx2vuhfAptyiMS3K4wQSVoHNnUd4hj+KxJXelNkWffirvMbiGND E3TXz+sNma+OrrZTktxm/q2xcnA4TVMiTb0MotMh3YBqmODx3Rn4Fd3s0kCqiqH1aIR4AnFYwJk hIy6C+/i5mR51MKD3CVi2ELPwXsW4JB4N/m14L6pZ+3JRq6539DFXz/XwNPTtwayzmPL0FnC42j VT35TSNcnQQh4Dhdr5BTHo5lByf+JGwMYE/591gy6+Ui1J X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:1886:b0:dc6:e884:2342 with SMTP id cj6-20020a056902188600b00dc6e8842342mr550652ybb.5.1711471667978; Tue, 26 Mar 2024 09:47:47 -0700 (PDT) Date: Tue, 26 Mar 2024 16:47:38 +0000 In-Reply-To: <20240326164739.153011-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326164739.153011-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326164739.153011-4-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 4/5] 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: Bp2zTd7FvVAF 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 Tue Mar 26 16:47:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp81597pzb; Tue, 26 Mar 2024 09:48:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8Foq1RhCsn/LJOfl9wd0ACXvKq8TUXJ7WbYJI4Kzgas7hDdL3jAOEwsknFuLOuK/+A9sGgnbW8PmYzNnNwqZ/nMSpqFyXJs5SIQ== X-Google-Smtp-Source: AGHT+IGLk9lQkWVF1NDAuPoMeMGMzWZoOorRcPALEbc4gjQGZdNTG//XF4GMCLcesE6T6yEuNtNs X-Received: by 2002:a17:906:daca:b0:a47:3322:4a6d with SMTP id xi10-20020a170906daca00b00a4733224a6dmr2172705ejb.21.1711471725975; Tue, 26 Mar 2024 09:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711471725; cv=none; d=google.com; s=arc-20160816; b=vg7RKNuuabGDw1oy5gHLE06GLGOHOQnPWlMZdIxMCzc8oyipswfDf4nc2rOhZe6aX0 ikCqqmdMvfNhnHhVN9EZ2aNdIFYF0zdQtWRtmQuR9V0BMoD/3rpQQqttqX512Y5CQ7Zz hDX8fmeWr+r+31DWdA3gJ0O+z4cahHW2zi2I9eid8dJHS1oabDPLIHfS5JxGUmOb2LWT f7nbhKUcSMMpY1YLRaeqpscVFaajo3yISlyxptuNa3avrAPxra4ps7I+BWRdR0+zAV7I p6IDCWLYNQ4l4wrGnL+HK6oDeC2RZLxPH5zBKajhCakM3c6/tlJHiLskhfDGvn9bwGrt 2pCg== 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=iEPl6Wlj9gJ9hl6juPNFPSBOyZ61mKe4Q81E/kDP8Y6RNrvwlmdDzUQiHMagWg4nJ8 4q5XHaLQYM5A/pSwMqnSDuUp7lAXJPNRb0+fah+71LQ6wOljk+hUCHUjG1dBmUDWcUUi H3IDQ+OfFWUKDiY7NoTRv3/nlQjHDZlMKpQLwSniVyDl1gufmK/N13OcQ2hw0ncc8+O5 PZP0uS57tlmTIkRJAJBIeW4062GeBLKIpQJJKjWoqRoyJffDoXyM0fxiBt1TZnpY+XZj 3HQKTC8esHryOJiErqjIh3mVymKQS8rR364AgKxPTXOVvbX+FUHwQ/oYG9B2m0GvdaZI niRw==; 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 e4-20020a170906314400b00a4df0d7789bsi972797eje.514.2024.03.26.09.48.37; Tue, 26 Mar 2024 09:48:45 -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 29E5668D641; Tue, 26 Mar 2024 18:47:58 +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 E396E68D61C for ; Tue, 26 Mar 2024 18:47:50 +0200 (EET) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-610ed1c0f93so98667307b3.1 for ; Tue, 26 Mar 2024 09:47:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711471669; x=1712076469; 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=m/L1jDloC2EEV6pPKVfyrXONVhFotIYd1AOM24ZHC1dTTB3tS9M3KBmQSMr5AC0iSh 0cN61yqYXs4wvaDHHa25jflzDm9yZHZ/FlP4knnDrgDcDieqDtRsrL+6BYF6PSSv+q// XIfCniftpZagdoRRVIccluhlsmluvRzvQshP2+NbG/ZmAETyemlm4ewDgtXAE2X2rs/P YuQvQ80ZYrAHxkZv3s54wsZUwx4guvRag8NfFhHhzeCJXv9ogC32hjE2iB5h2WfcvxU8 lq8Uno+O4QDyGm4gWJihyLMospFBBhreva/aQjMVds0ZIw0vWRxYUWmaOVEcrIpLRSAH UWZA== X-Gm-Message-State: AOJu0Yy4SbRlRpT7JKGFVUaG+FPbUCAy1sAJhR+W95AIqGhCRMc+CtYx tZWj6UkFqWblVBSssYhl64BXh6Qcp5vj+pqwHaaHFQgNCKtcomICjo8RzcARvDBaPonjklGbYBm JWXb7ISqQgpAdySAcqYoLZ1+E4M216aDumBnvnK5bkCy1maYuLha7zWwMceqia9UJiLgGifQjmp PpI/Yn21oqnZXxrtR7TRQyJgQVNWunVnmsNp9t5U8yOxxs X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a81:89c4:0:b0:60a:6a5d:7db0 with SMTP id z187-20020a8189c4000000b0060a6a5d7db0mr2302175ywf.0.1711471669616; Tue, 26 Mar 2024 09:47:49 -0700 (PDT) Date: Tue, 26 Mar 2024 16:47:39 +0000 In-Reply-To: <20240326164739.153011-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326164739.153011-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326164739.153011-5-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 5/5] 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: dNrjTUNID/3e 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