From patchwork Tue Mar 26 23:07:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47505 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp269639pzb; Tue, 26 Mar 2024 16:08:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+13f1cELPsmTY3OpUYntmTZOa8E/byJQIfOs4fe6YIp0VT12onHv+Oax2b4kNGp2pa1iVGxe6e6M571C3vpjSqX0DqR/hlkcYOA== X-Google-Smtp-Source: AGHT+IHoOtRVyQwJoGkJIMViINQZ+qYGMVqbsdVxG9bjQmo93tJveA7caBZyke+zy3S2BJmNbQV8 X-Received: by 2002:a17:907:7da5:b0:a47:52fe:ef5 with SMTP id oz37-20020a1709077da500b00a4752fe0ef5mr6041735ejc.0.1711494495556; Tue, 26 Mar 2024 16:08:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711494495; cv=none; d=google.com; s=arc-20160816; b=vY/cQD7XdlYhThfVjJSdHw3AdkCWYc/XjmPlrw/iqHI98J2hrajsrdNfFtwWAzQ3bU EutwQ08Z89vCGST151eKwNIarrEKTV7286qAxXIaPfCHQuWjgmpUgifD+GscGilRLAKl KqGkmYauplkt94vOp4+UroA7xpVndFmALPYuz2lrzZzGJ4BO1R1vTKNopmR8YTWEATx7 2Dfl1Q3XYlkJC2lEClRoshXtBzhId9JmV1C0Ur48FTnX1Y1y/DTbm0QHO5HshamW0AQq qTTTDZyxXms9OwAKbMU5k2rT/4FGwbzRWfc46cqoHZt0+xr7EnasoKk8WaQGMQQVMZz0 Yk/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:mime-version:date :delivered-to; bh=DafXS7GPMcYclAExCXiFHKBe35LSXmdXcgzyNci+AjQ=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=iSqNng/0zrI/NO7DVyNu1GhXUee0WsXW7spXSmiedueY1ozw9hLsVB82Kf2E4g7dzm qC+rf5t6qzCXledgn0nAu7j8vLlpIiwpKofdlSFK4AxFVXLY+dJtGzaMbqkmJ1UGopOJ ZqRbesk2C2BByK0x6Ju2lxmm0BykAOVKplgAp8ukkztepoU+D4ZZum2caYFeOH3gZua+ z4b2ywNXDIaW/S9Zb5BVSwi9BHtJRN/JAEt3k460BxV4ePFpFfQWMqtillMVst64pA4u +BBUJ22YkhNz/JUrv7r7g6sKX6Cbf1+Eb6Gb3dAzoZqfxGDb7TjW0SKt+fJHvn97E5Hu xA/g==; 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 nb16-20020a1709071c9000b00a47534ae659si2869168ejc.922.2024.03.26.16.08.15; Tue, 26 Mar 2024 16:08:15 -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 091CB68D69A; Wed, 27 Mar 2024 01:08:12 +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 3F4EE68D680 for ; Wed, 27 Mar 2024 01:08:05 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-613f563def5so1591187b3.1 for ; Tue, 26 Mar 2024 16:08:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711494483; x=1712099283; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zJZR5sd72dfEIylOTwiBKyI+BwFxrHSL0cLmZeEFV1I=; b=jYA9ERUgX65aHJJSrhHkDUdmiRrZMr2ODceku7MZ3l7yGZ/DJuw1X3qQGB8BeuWEbm f8jLM+5xDEaYdjYxDiZHPldp8HOo1ee4ApBkKQQ2dU/GYAZH2pHGTAQhnvrzxSfRBgyf hqbhcBbdbblos0RTu6F6HKhh+ZnK8zmdpUdAQqr4JpmJs3tQcDgQmwD0JLlcbguenvb7 SerGyO89gsugfC5X3z69NV+ps6He4u61+Yq630kT/KHCJ4OzazjCoCTVJ7WT2alIv/j8 +Td5l24S+U9WGC1aC7DV3JDeAcZkj+24VAehzPDc0w3WfO0WQiyXDBPRGSujnsCAaZ9i Mccw== X-Gm-Message-State: AOJu0YwgQEbJORKJiLYk1Uw/t12BnJzIsOaTzGMEEszL+EIJmwWT00vG +Cue40gtQJwLa4Oi7oWqqZPxGrl32olOiJ9+jMmxxnFXgqqoSU2saOt9xl+u/oUGZOxUPRK/7A6 rh2oWwhMbMYiu1//XkEosvKKiIuPZlDT2QpINDNQnavOAKg6aU4UUf5BiBs/pH5XBwOzU3AKbX4 q2rZaiaVDkT/NQjkoIXBg2QWIGk8CmDB/spHqMrWQde749 X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:2407:b0:dcd:4286:4498 with SMTP id dr7-20020a056902240700b00dcd42864498mr747129ybb.6.1711494483537; Tue, 26 Mar 2024 16:08:03 -0700 (PDT) Date: Tue, 26 Mar 2024 23:07:53 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326230757.282319-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: rBqrWwxWdYp+ Signed-off-by: Antoine Soulier --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index 2a1d22310b..4262b96117 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 @@ -3499,6 +3501,9 @@ libilbc_encoder_deps="libilbc" libjxl_decoder_deps="libjxl libjxl_threads" libjxl_encoder_deps="libjxl libjxl_threads" libkvazaar_encoder_deps="libkvazaar" +liblc3_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" @@ -6869,6 +6874,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 23:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp269708pzb; Tue, 26 Mar 2024 16:08:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBSOR/K8Cquf02KOF/+xucyF2xzhudxATG5h+96uGiC9Sap2lSuF2LrF2iRcAR+kMjWvEEGvNS+dAEbbNtDHzVIpT6hUs6/SB/pQ== X-Google-Smtp-Source: AGHT+IHfpXB0kV/7FX02TYFH7Vt4IQkjfqHyWCsP0qwRhl8ISW6dlxaV4Ssd3u51vFE5lrqiCfJF X-Received: by 2002:a17:906:1318:b0:a46:ad7c:50ad with SMTP id w24-20020a170906131800b00a46ad7c50admr6839575ejb.3.1711494505101; Tue, 26 Mar 2024 16:08:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711494505; cv=none; d=google.com; s=arc-20160816; b=vAIvnLMjmI2ri1GD3QNt8HLzV6Myq2M/oQe6S/bKNJ3kZjpQ+4WtSaPjBQZK27gMSq aBHdKis0Gch/BF4FAa2huOH0gDIMFHmmoDJVmEFY6hRqGPaNM2yx8pzHwKqEP9e4GPcF 55Gv7ls19ye7xBOhSbcnJLTsYV7VMWWmM9yyG4hdeHwDmN1dwiQ9BRxcKLRYMbI2vETw ati2i9uBDB1CrqZT28Tw/Q+dhzHDmwlyheH3RZEwgymiXbez0SfdKd6LAq0UjIaoUmX/ 8X0w4ER0Cfm3F7zdvtDm1eQRW1uyf4zEXM7F8IdrkRwci8sj6FLmkkz0SUMDnZTy5ylB 6ejA== 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=iBYxQrIH+7aURi5DiLwoJ2LLOtOvoeitAVygrV1q684=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=Dod0FqZmbp0cv/F5/bXfdYPBPca3Q+RETUTEX/BhfY12TooRQrUfmff8Wu6EIPNSn5 vOZ3I2B9v6Y4s9QzRzCw5J7idgQigSk3UABcOLf6qeuzBCkQzk7WDGfjlzzJSLfIEScf 4WHYsv/4+5AEj9vpLC0+QaCH04Os4yJl8Hz21JMoAaee4E3oArSMUzymsFdahGwkyAyA N6opc3CEqVroiW0nj/MZ3lAKrVVdnob8naEEYOCptzNnAk+hLyljATkJuGyoO+enYzKY jlVT5UhuraOrxnh/yYVWmEdz4irlLlnGAql0KZy6zbzk2OuELXc5z2Si1/9SdKOAUywO fLow==; 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 bg26-20020a170906a05a00b00a474a2e5393si3352588ejb.123.2024.03.26.16.08.24; Tue, 26 Mar 2024 16:08:25 -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 264D168D6A3; Wed, 27 Mar 2024 01:08:14 +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 A0E3368D687 for ; Wed, 27 Mar 2024 01:08:06 +0200 (EET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dd0ae66422fso677686276.0 for ; Tue, 26 Mar 2024 16:08:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711494485; x=1712099285; 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=zatUt1lpCUCo1C+7Pz9SdwTF8sr8X5VCbqiLX5jY1Xs=; b=aDhHubKkw6kYS8Z4pzepPIVaYv/xJ4nYkypHCHp8CBI1iJ+Zxr7yGvFFrsAKtgMl76 VL2CU0wvXLdVPF5xmkbI5aDYQESGACIROtxkSRGcL1RfcgcW1XTxwsLS9Hs4GcDkbtaz Lc4Ws5u8DPkk4IHZm7bHffMBDFFaOGL15Qkels1vXgAfMNYh5zEnN67z4UW+NPeuFUHo RdTM8O4fpamv/ZPhtxpAlscOnNY28Bj0mi/kEOKk/vUHMNi0UbLvgh8lVDF88gSv4O8u BAOWbU6G7xkGSMBmB3NoCTntMYLTfL99kMqqANphG76JeUpvmRSfTv6JIo9oenwpKnYm SrNg== X-Gm-Message-State: AOJu0YzQSPbJQ2MI6gJZSDfjdFcGL1BZsyP2lA0sVftpYX4kjxLwbCAJ kbV+2t1ROpq7UlMwRdVMvlVPjZ0zGcS/EXEazcZ+Ko8AEOEbTWbEE2AIoV8gKlU1HkbXn+4xPPd 23nagnyTIgltESTJ1hSSfVFXS9btm4+uxbQYuoJ6Q79t8rlZAUteRYi21eRXlM/yyEprH75Rh/I 9jqkg5hlXQV8MnU0LSv+gn74rurUqjhP/jY8H6BrvYn0sh X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a25:abe6:0:b0:dc7:4ca0:cbf0 with SMTP id v93-20020a25abe6000000b00dc74ca0cbf0mr525842ybi.3.1711494485154; Tue, 26 Mar 2024 16:08:05 -0700 (PDT) Date: Tue, 26 Mar 2024 23:07:54 +0000 In-Reply-To: <20240326230757.282319-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326230757.282319-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326230757.282319-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: VsP+eHLtIFlv The LC3 audio codec is the default codec of Bluetooth LE audio. This is a wrapper over the liblc3 library (https://github.com/google/liblc3). Signed-off-by: Antoine Soulier --- libavcodec/Makefile | 2 + libavcodec/allcodecs.c | 2 + libavcodec/codec_desc.c | 7 ++ libavcodec/codec_id.h | 1 + libavcodec/liblc3dec.c | 138 +++++++++++++++++++++++++++++ libavcodec/liblc3enc.c | 192 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 342 insertions(+) create mode 100644 libavcodec/liblc3dec.c create mode 100644 libavcodec/liblc3enc.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9ce6d445c1..e70811dbd6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1123,6 +1123,8 @@ OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o OBJS-$(CONFIG_LIBJXL_DECODER) += libjxldec.o libjxl.o OBJS-$(CONFIG_LIBJXL_ENCODER) += libjxlenc.o libjxl.o OBJS-$(CONFIG_LIBKVAZAAR_ENCODER) += libkvazaar.o +OBJS-$(CONFIG_LIBLC3_ENCODER) += liblc3enc.o +OBJS-$(CONFIG_LIBLC3_DECODER) += liblc3dec.o OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 2386b450a6..f4705651fb 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -776,6 +776,8 @@ extern const FFCodec ff_libilbc_encoder; extern const FFCodec ff_libilbc_decoder; extern const FFCodec ff_libjxl_decoder; extern const FFCodec ff_libjxl_encoder; +extern const FFCodec ff_liblc3_encoder; +extern const FFCodec ff_liblc3_decoder; extern const FFCodec ff_libmp3lame_encoder; extern const FFCodec ff_libopencore_amrnb_encoder; extern const FFCodec ff_libopencore_amrnb_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 3bab86db62..7dba61dc8b 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3425,6 +3425,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("QOA (Quite OK Audio)"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_LC3, + .type = AVMEDIA_TYPE_AUDIO, + .name = "lc3", + .long_name = NULL_IF_CONFIG_SMALL("LC3 (Low Complexity Communication Codec)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* subtitle codecs */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index c8dc21da74..0ab1e34a61 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -543,6 +543,7 @@ enum AVCodecID { AV_CODEC_ID_AC4, AV_CODEC_ID_OSQ, AV_CODEC_ID_QOA, + AV_CODEC_ID_LC3, /* subtitle codecs */ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. diff --git a/libavcodec/liblc3dec.c b/libavcodec/liblc3dec.c new file mode 100644 index 0000000000..bed014652e --- /dev/null +++ b/libavcodec/liblc3dec.c @@ -0,0 +1,138 @@ +/* + * LC3 decoder wrapper + * Copyright (C) 2024 Antoine Soulier + * + * This file is part of FFmpeg. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +#include "libavutil/intreadwrite.h" + +#include "avcodec.h" +#include "codec.h" +#include "codec_internal.h" +#include "decode.h" +#include "internal.h" + +#define DECODER_MAX_CHANNELS 2 + +typedef struct LibLC3DecContext { + int frame_us, srate_hz; + bool hr_mode; + void *decoder_mem; + lc3_decoder_t decoder[DECODER_MAX_CHANNELS]; +} LibLC3DecContext; + +static av_cold int liblc3_decode_init(AVCodecContext *avctx) +{ + LibLC3DecContext *liblc3 = avctx->priv_data; + int channels = avctx->ch_layout.nb_channels; + unsigned decoder_size; + + if (avctx->extradata_size < 2) + return AVERROR_INVALIDDATA; + + liblc3->frame_us = AV_RL16(avctx->extradata + 0); + liblc3->srate_hz = avctx->sample_rate; + liblc3->hr_mode = avctx->extradata_size >= 6 && + AV_RL16(avctx->extradata + 4); + + av_log(avctx, AV_LOG_INFO, + "Decoding %.1f ms frames\n", liblc3->frame_us * 1e-3f); + if (liblc3->hr_mode) + av_log(avctx, AV_LOG_INFO, "High-resolution mode enabled\n"); + + decoder_size = lc3_hr_decoder_size( + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz); + if (!decoder_size) + return AVERROR_INVALIDDATA; + + liblc3->decoder_mem = av_malloc_array(channels, decoder_size); + if (!liblc3->decoder_mem) + return AVERROR(ENOMEM); + + for (int ch = 0; ch < channels; ch++) { + liblc3->decoder[ch] = lc3_hr_setup_decoder( + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz, 0, + (char *)liblc3->decoder_mem + ch * decoder_size); + if (!liblc3->decoder[ch]) + return AVERROR_INVALIDDATA; + } + + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + avctx->delay = lc3_hr_delay_samples( + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz); + avctx->internal->skip_samples = avctx->delay; + + return 0; +} + +static av_cold int liblc3_decode_close(AVCodecContext *avctx) +{ + LibLC3DecContext *liblc3 = avctx->priv_data; + + av_free(liblc3->decoder_mem); + + return 0; +} + +static int liblc3_decode(AVCodecContext *avctx, AVFrame *frame, + int *got_frame_ptr, AVPacket *avpkt) +{ + LibLC3DecContext *liblc3 = avctx->priv_data; + int channels = avctx->ch_layout.nb_channels; + uint8_t *in = avpkt->data; + int block_bytes, ret; + + frame->nb_samples = lc3_hr_frame_samples( + liblc3->hr_mode, liblc3->frame_us, liblc3->srate_hz); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + block_bytes = avpkt->size; + for (int ch = 0; ch < channels; ch++) { + int frame_bytes = block_bytes / channels + + (ch < block_bytes % channels); + + + ret = lc3_decode(liblc3->decoder[ch], in, frame_bytes, + LC3_PCM_FORMAT_FLOAT, frame->data[ch], 1); + if (ret < 0) + return AVERROR_INVALIDDATA; + + in += frame_bytes; + } + + frame->nb_samples = FFMIN(frame->nb_samples, avpkt->duration); + + *got_frame_ptr = 1; + + return avpkt->size; +} + +const FFCodec ff_liblc3_decoder = { + .p.name = "liblc3", + CODEC_LONG_NAME("LC3 (Low Complexity Communication Codec)"), + .p.type = AVMEDIA_TYPE_AUDIO, + .p.id = AV_CODEC_ID_LC3, + .p.capabilities = AV_CODEC_CAP_DR1, + .p.wrapper_name = "liblc3", + .priv_data_size = sizeof(LibLC3DecContext), + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, + .init = liblc3_decode_init, + .close = liblc3_decode_close, + FF_CODEC_DECODE_CB(liblc3_decode), +}; diff --git a/libavcodec/liblc3enc.c b/libavcodec/liblc3enc.c new file mode 100644 index 0000000000..f9c72293e3 --- /dev/null +++ b/libavcodec/liblc3enc.c @@ -0,0 +1,192 @@ +/* + * LC3 encoder wrapper + * Copyright (C) 2024 Antoine Soulier + * + * This file is part of FFmpeg. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +#include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" + +#include "avcodec.h" +#include "codec.h" +#include "codec_internal.h" +#include "encode.h" + +#define ENCODER_MAX_CHANNELS 2 + +typedef struct LibLC3EncOpts { + float frame_duration; + bool hr_mode; +} LibLC3EncOpts; + +typedef struct LibLC3EncContext { + AVClass *av_class; + LibLC3EncOpts opts; + int block_bytes; + void *encoder_mem; + lc3_encoder_t encoder[ENCODER_MAX_CHANNELS]; +} LibLC3EncContext; + +static av_cold int liblc3_encode_init(AVCodecContext *avctx) +{ + LibLC3EncContext *liblc3 = avctx->priv_data; + bool hr_mode = liblc3->opts.hr_mode; + int frame_us = liblc3->opts.frame_duration * 1000; + int srate_hz = avctx->sample_rate; + int channels = avctx->ch_layout.nb_channels; + int effective_bit_rate; + unsigned encoder_size; + + if (frame_us != 2500 && frame_us != 5000 && + frame_us != 7500 && frame_us != 10000 ) { + av_log(avctx, AV_LOG_ERROR, + "Unsupported frame duration %.1f ms\n", frame_us / 1e3f); + return AVERROR(EINVAL); + } + + hr_mode |= srate_hz > 48000; + hr_mode &= srate_hz >= 48000; + + if (frame_us == 7500 && hr_mode) { + av_log(avctx, AV_LOG_ERROR, + "High-resolution mode not supported with 7.5 ms frames\n"); + return AVERROR(EINVAL); + } + + av_log(avctx, AV_LOG_INFO, "Encoding %.1f ms frames\n", frame_us / 1e3f); + if (hr_mode) + av_log(avctx, AV_LOG_INFO, "High-resolution mode enabled\n"); + + liblc3->block_bytes = lc3_hr_frame_block_bytes( + hr_mode, frame_us, srate_hz, channels, avctx->bit_rate); + + effective_bit_rate = lc3_hr_resolve_bitrate( + hr_mode, frame_us, srate_hz, liblc3->block_bytes); + + if (avctx->bit_rate != effective_bit_rate) + av_log(avctx, AV_LOG_WARNING, + "Bitrate changed to %d bps\n", effective_bit_rate); + avctx->bit_rate = effective_bit_rate; + + encoder_size = lc3_hr_encoder_size(hr_mode, frame_us, srate_hz); + if (!encoder_size) + return AVERROR(EINVAL); + + liblc3->encoder_mem = av_malloc_array(channels, encoder_size); + if (!liblc3->encoder_mem) + return AVERROR(ENOMEM); + + for (int ch = 0; ch < channels; ch++) { + liblc3->encoder[ch] = lc3_hr_setup_encoder( + hr_mode, frame_us, srate_hz, 0, + (char *)liblc3->encoder_mem + ch * encoder_size); + if (!liblc3->encoder[ch]) + return AVERROR(EINVAL); + } + + avctx->extradata = av_mallocz(6 + AV_INPUT_BUFFER_PADDING_SIZE); + if (!avctx->extradata) + return AVERROR(ENOMEM); + + AV_WL16(avctx->extradata + 0, frame_us); + AV_WL16(avctx->extradata + 2, 0); + AV_WL16(avctx->extradata + 4, hr_mode); + avctx->extradata_size = 6; + + avctx->frame_size = lc3_hr_frame_samples(hr_mode, frame_us, srate_hz); + + return 0; +} + +static av_cold int liblc3_encode_close(AVCodecContext *avctx) +{ + LibLC3EncContext *liblc3 = avctx->priv_data; + + av_free(liblc3->encoder_mem); + + 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 23:07:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47507 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp269795pzb; Tue, 26 Mar 2024 16:08:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWceNKTt5zf+Hce5gOXct9RzhuKWG5weevo9unkxqgSM9JxUIb/Zcmcas+YNXNRllzyqY2sNCABKSzN5tSb75lmqXN3lenUK2aU7Q== X-Google-Smtp-Source: AGHT+IGzM5htJoHNqdbj3kkV1fD7HuLiB3ARvgPZojW722jORtVyV9L2wuKEe7Xe3N5VWjBPEhsh X-Received: by 2002:a17:906:81d1:b0:a46:a8ba:60b3 with SMTP id e17-20020a17090681d100b00a46a8ba60b3mr769724ejx.37.1711494514069; Tue, 26 Mar 2024 16:08:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711494514; cv=none; d=google.com; s=arc-20160816; b=ycQ6Q+MXooFE/pS4eD8Si2ynms76W6CFgYO3qJYVY8CFVoVejG9FumSnJu6T53DOEa I0GKNknXQ1P5+Odog2EUH/tymhQ8SiWjsHI+8S6J4RcNwgK+F11T/IB7AQENxw7oudn3 txtdrJbx1kaJ5QV5Lr9NfmOPZRsxfx8sG1iiBf6ScHzHXJIUFPn4huXD37biw6X22mJ6 TFbkoIJN0+31q7N6szsrjOpNhsmktJFas2GxUxjMlWe/k0IY8uUHpnrgXBSL6B1wPnN/ TVouvuVR/WfTn8ldLcArq0EppzNkKyVBLSaUI/JE2o1oNoVVQIhZ5bLW7Vzh0Odm+DJs Z6Ng== 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=lQY1vvxwkKyE8U7VNi5GvwTrGSlxqPv3fPHk7IetmFk=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=Dq2IIwXGnRuUn3t0Cb+SihdBMkPvLBgFq1qcZ3jW1caNKbqPIthdSHLo0npXL4+7NR uTKmhlNlWFneIevTYseojeOksZmVN+m2afc5w6WzDwXkZRiKY3rJFBaapmsLktUQlZy+ 8DC+bw9mryh0wVm99wbzXl4AmsJ4GCBHrstnnoxpujDmXZU1y1ae7NSpQl2Hk04oAZ3r pK3vgbwnh34RcLrtObivB31YPLcvqWhLWLIpBpD2WoU+iNDJN/9kK6qI9DBnZM3A+Jwi Up36GzW4E5E2AHUmAORgZPcVBIP+A0jSc9iBIweLPExDiF5kSVQoq4DFNImFOcv/CDkQ ouLA==; 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 uz12-20020a170907118c00b00a4a399a97e2si2056303ejb.726.2024.03.26.16.08.33; Tue, 26 Mar 2024 16:08: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 4A85468D6AD; Wed, 27 Mar 2024 01:08:17 +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 323F668D696 for ; Wed, 27 Mar 2024 01:08:08 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-60a0a5bf550so116091197b3.3 for ; Tue, 26 Mar 2024 16:08:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711494487; x=1712099287; 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=S3df9giQpJVqTm6Ag25DJ3ScVzNH1JK0tiXPsxWP0ZI=; b=k/Pd/g4qZq/l6PXQra9vmRl4yecjN5oq8AvbQC7u5GPJ/CwjR06CeYMItL+g5DgTz1 4v8F2ZF8KiT54f2W96x5UO8CH8y4M1/t3zpujtMB7Oq/zmjEwC1El1oOPCjSPUY/uxSG yMjVhlTbFBqsOu2nzYFPOaY8FK9Ddu89OB4QU0sTZaEcO+vg1AFlb6YD0L2Vtsd2vku6 DV/Xtn2Z9gySmUcH+eZ0TRHTUv7QoaQkq6uk6gLGplkJw+W8/OrYTsKMoEvmg1j2ye42 oJGZMMw0Itp1F+xFUXNlcSPHHfh/xz3dnBFYP0BT1qobGLywxxJlpUsDObBULc7ESyZE ExQg== X-Gm-Message-State: AOJu0Yx0ZqjbQL3AwTPcs2SmzIUltBaJw1pyyTRl9epNBJ5TtIaNbdwA 94kKeen7O3MnWptaAiDOCK1ZPRi6ZOVsdorpSoAE9uwKdOLNxc5mV1rL0k+BDph9UwGuOzcr+j6 KNthwS3xqO+2fKHp8OJVUbgWAjrg2Q0/nBLLebx2lQx1aJWAtaiFVnIdaJyCJqUiqZ++yzc8vkv CHHZOfzB/TxOsJr54lokIY/A23HYkZ2CxXBY4lICENQNWQ X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:1b02:b0:dd9:1db5:8348 with SMTP id eh2-20020a0569021b0200b00dd91db58348mr3622618ybb.8.1711494486744; Tue, 26 Mar 2024 16:08:06 -0700 (PDT) Date: Tue, 26 Mar 2024 23:07:55 +0000 In-Reply-To: <20240326230757.282319-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326230757.282319-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326230757.282319-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: 6WwMVKulG+dh 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 --- libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/lc3dec.c | 137 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 100 ++++++++++++++++++++++++++++ 4 files changed, 241 insertions(+) create mode 100644 libavformat/lc3dec.c create mode 100644 libavformat/lc3enc.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 44aa485029..4961c42852 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -332,6 +332,8 @@ 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_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..e225354faf 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -252,6 +252,8 @@ 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 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..164917d946 --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,137 @@ +/* + * 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 "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; + int 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 = 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 = av_rescale(frame_us, srate_hz, 1000*1000); + + lc3->position = 0; + lc3->length = st->duration + + av_rescale(frame_us == 7500 ? 4000 : 2500, srate_hz, 1000*1000); + + return 0; +} + +static int lc3_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + LC3DemuxContext *lc3 = s->priv_data; + AVIOContext *pb = s->pb; + int ret; + + ret = av_get_packet(s->pb, pkt, avio_rl16(pb)); + if (ret < 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 (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..6a61264e08 --- /dev/null +++ b/libavformat/lc3enc.c @@ -0,0 +1,100 @@ +/* + * 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 "libavutil/intreadwrite.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; + int ep_mode = 0, hr_mode = 0; + uint32_t nb_samples = av_rescale_q( + st->duration, st->time_base, (AVRational){ 1, srate_hz }); + + if (st->codecpar->extradata_size >= 6) { + frame_us = AV_RL16(st->codecpar->extradata + 0); + ep_mode = AV_RL16(st->codecpar->extradata + 2); + 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, +}; From patchwork Tue Mar 26 23:07:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47508 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp269876pzb; Tue, 26 Mar 2024 16:08:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJ+IYXAcHE2f/z4R1bZgZpIW6DHxqsU85HUD8Hl/eS64nKdJ+kCuxesRsZ+8+D8rOnhn03Xnyw11O1N+jiRIF7QHlYB9l3O5c/fg== X-Google-Smtp-Source: AGHT+IE31K9kzrVKe7KAB1Zci587GtpO+67XORfRm5zi35Njgd2QCgSIJNCr2W2lo97X7MV1mrau X-Received: by 2002:a17:907:9716:b0:a47:4f67:7085 with SMTP id jg22-20020a170907971600b00a474f677085mr7122870ejc.1.1711494522689; Tue, 26 Mar 2024 16:08:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711494522; cv=none; d=google.com; s=arc-20160816; b=mrYyiYBS2FbhL6eLHNof7wezMKukv24siTZUFWHJTO34paD7vpxAaCYMtqcfw3PF72 htpGTELWH+qdrlbqiLmQIkfvvFh3vm+Si187SGu49RYtboQtGS5dNFdEBpnfrR7DK0wD x66oKig97V4/ZkoivtHHR7NPHSy5Q2OPv9P+7hGnBHKDGCI9WchxEwwIbqB5Dvskke36 3ifdjVgJT17DC/t3WqELVzU6E5CWL5nSBIrsO0ShYJSyfrUOy+NBbg57qHE/tNOKpkUz Uagm/RutDflyJr2c5rCsJbbOsPt8V7x6SFDUw8QKwRrP75MhFSy2SPScIyXwAR5AGHw5 vh+Q== 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=V8hpyTZ/bbfE8rzXJBFDmlQwokjgZqTg20IM7yoTG04=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=OAn0Td2Y2xOXvNnO+Km3n4HbSN+zVQsAuZvPVbU1d3O5z0K2KIPskS+1SNZ7RUAoKd MWh0q76ZwlBlng+KiJV4rpEfn2rBdDFlDqm20qY0v3LpafAiNWgQx/EfdfDaWgyiNIUq lsBGHPtWuErWsxtxRdzErJB1Oc8wjJtEtD8vaCgPdSr4JpCE76SJsJqyX/1yK+7dTZI0 n8MGwo9q7fzTtD/2mcGccgpeicgkvFX/6nHtpMj4Dc0YdCprsk42SQ8OqnLiiPO8OyH1 6VIyFodWa/NyaHqQ0ZVmm2M6MqrR0YyPbEXlM70MS+UlAYVJB34G/j0JfkHEq92Wde7C lTGw==; 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 s24-20020a170906a19800b00a466bf305cfsi4050785ejy.619.2024.03.26.16.08.42; Tue, 26 Mar 2024 16:08:42 -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 3CDE068D6B3; Wed, 27 Mar 2024 01:08:18 +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 B5C5A68D6A5 for ; Wed, 27 Mar 2024 01:08:09 +0200 (EET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dccc49ef73eso9031720276.2 for ; Tue, 26 Mar 2024 16:08:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711494488; x=1712099288; 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=bXJEewB3fmHVFcWQAcIc27DgSjqSqPL+uAUCWz/71Yg=; b=Hhayq3BypaLkOK9F9wGUKukI+dSg0zxcd27nPElKa0TOhdU7UVdWZ4KlGw9a4H5vJ9 2CNH3TJCbQcCHDYmpMHqHe2syZOi93uHF6+z0or5wGxaglJoDGauG3YxiZBK7KKrP+9a 5FRsM3ju8kgoHYkToLt3PWuRco4R5V9UZ+hhlnjPsip0EkaO12a+BzcYPkDzXtBuWGxu 3EuoLTZPy0CcLO8Yokq+DJHo52EbhM2hSEL6U8ESX8yMFQOFJ1I/TeS87QLZGAP2WvBF 2V1QLv162iqVnlynYYyXhS4jt2adwMqnn68XDb1/Z+FsRejTWtzJU3l86/rFbWiOoyWE cf3w== X-Gm-Message-State: AOJu0YyCFoGVUHEnYQG+ipQZ9O9FC/m8QJmM1eJoybxDETPSfq3P/WA9 VPi4ygCWS1wBjY0ToOiopSn1rE59JMSm/rsNUS4bLGSAl/r5FxBoFF7UVO7nmsnLQq08GFnqxMi VR3ig0cXX775rJe7oHBsbwF3H9QVcq+fnBC/ZJdMRrpGyrg8FOsoGek+OU2+1CXskWyMr7cVhlC EqjNLbB84jAU+Su75Wg5kk+BhaqfpgazZf7Ju9Qz4Vow/i X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:1b90:b0:dbe:a0c2:df25 with SMTP id ei16-20020a0569021b9000b00dbea0c2df25mr747415ybb.8.1711494488399; Tue, 26 Mar 2024 16:08:08 -0700 (PDT) Date: Tue, 26 Mar 2024 23:07:56 +0000 In-Reply-To: <20240326230757.282319-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326230757.282319-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326230757.282319-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: kHRGyn6013xy Signed-off-by: Antoine Soulier --- doc/encoders.texi | 57 +++++++++++++++++++++++++++++++++++++++ doc/general_contents.texi | 11 +++++++- doc/muxers.texi | 6 +++++ 3 files changed, 73 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..e7cf4f8239 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,8 @@ 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 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 a10a8e216f..9687746c30 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2612,6 +2612,12 @@ WebDAV server every second: ffmpeg -f x11grab -framerate 1 -i :0.0 -q:v 6 -update 1 -protocol_opts method=PUT http://example.com/desktop.jpg @end example +@section lc3 +Bluetooth SIG Low Complexity Communication Codec audio (LC3), or +ETSI TS 103 634 Low Complexity Communication Codec plus (LC3plus). + +This muxer accepts a single @code{lc3} audio stream. + @section matroska Matroska container muxer. From patchwork Tue Mar 26 23:07:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp269947pzb; Tue, 26 Mar 2024 16:08:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEWpMGxHuCQT8h+Ax/TFG+xV5z3NE2Ww1EVi2Ctdw2d8jpvuIyYos/PBqSFlD7iEziUDiGemxfS1gCcj5DN6H2AR+zeKSRGxfSWg== X-Google-Smtp-Source: AGHT+IFgC+mQHN/cREeazBG3fnfZKu2QBpnPrcEghBy5Qf1zfbbocP5SzuaBHnIGTGg+LnrBkwYY X-Received: by 2002:a50:874b:0:b0:567:156e:7893 with SMTP id 11-20020a50874b000000b00567156e7893mr7800958edv.4.1711494532008; Tue, 26 Mar 2024 16:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711494531; cv=none; d=google.com; s=arc-20160816; b=eHB2wKh99D+vxM1BFGrwmjDqEbZxUaOgmlr8wrOHIKQZ58kSytZlSUqewWV+yVRLcI JyEt0ZRoNBrzjf8A+lA0uQYkDB5H1HGvjFvz601Hmp2/eqwwZn93uWLJwGowDhjQYQOw +arPJCDIEqO1Bnk4ALsPJbAAti9Q8XHPTy7pK48ntn8qyKjCFz6avXDS+AKAyNXh3w2T I6bEfUCM+vnZUT5kNcYC9MCgTHOG1khZnkyvjoC0qXmI1JvKuIJw6Ej36lRkxRcSTDiv oppHezp6dZ/u3evInWDkXKzSfxyCR5WDdUzJVIq6zz7JLP6VsFw7J2vbPpMJGmmJKAa5 LFxg== 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=9DQxivd2G+7AL+Jyq2FAAMtBB+Slc5+HV/cpkbYuFIU=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=iY/hw7G2yMKlw7gWvQg6XhDK29FF0bQTbwSHuOTi4laXJA299N4xjDt6+9Kr7qsdct yexrksy+Mg/MzwACrfGn471nYsnaPmu4AAqn7Z8w+EQzUQpu3s8oD9yT34tMXWbQe0LI cNu0C6qToiKKMBnrLw68B1HzLhkKZN6Z4WNiORCslUrhUxOxbyV1xUbRZOvEpOvH0SVd d1tqzHJSKzO9Sa2KnRoJrZrLUVc8GIAVl52fUqXRnDDXLbDeq/YbtHFuk7FYbRSa8RRK tjleIBYjVxIbFwtlvGzV32d5GU1kK+7Ro8M4kQCE5ZIzHaVjJTY3yL2B1S1jDtUPPou/ 3dWg==; 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 u28-20020a50d51c000000b0056bc792c019si3975536edi.499.2024.03.26.16.08.51; Tue, 26 Mar 2024 16:08:51 -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 5677568D6B9; Wed, 27 Mar 2024 01:08:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 642A168D6AE for ; Wed, 27 Mar 2024 01:08:12 +0200 (EET) Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-5ce67a3f275so3698276a12.0 for ; Tue, 26 Mar 2024 16:08:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711494490; x=1712099290; 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=yO3MarnriirV/LmsbkEhNSavkFmcpmFqtaXw2wiCY30=; b=dFKa5MSdS46nBHPJqijblJ+OdjFdFBfMdJ18cccNrvHDQeopjagUX68JQLjhNCpNQY 2wMK3d6vuponacJNUoWxRjPNcarU/6hcgmxP6zxQ7ik6vJ/fFKnPCiBMtteReANpvjTE v9NteP6E0nyv+JxVX2IWQKBBtZyc9KQ3KBi7UlGGT+ZY7b0Rbh6KoQb00plez5s2rg2c XBdD52jEp6qRKtiq5kw8a0CNku4G75cLoQIqOKguxWoogl9EyCFuS0aD2P5Z995g7bt7 uvPgxyHQqCvX1/8n0NvF+gRtl6h294Jwej/rQroOaZfqlq2kRWgcudoC1ZVI0PHoxN5n +djg== X-Gm-Message-State: AOJu0YzNbgFToKTGrN3JjbIZBnULxJ726Y3vwb42XMenTKtyk9uWDfGe fOiaNTZq/HCGpY8unL4nSWH9RnE4BLQRWT5uSYUx7wUuFZM+fqKs+E3Gg7C/+6IImUtk//Gbaca PXP5Bid44zpSj9jD1ik4WSdV2QGL9aDVXEvvcle2ZUnechLQJSC5ch9yfcOmS0nPPplR0NIHua4 T9qb5bOvhTSiraYnBiyccLYJ9n9f699hxpSgz7lIu0jzJ7 X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a63:d806:0:b0:5dc:8970:45a3 with SMTP id b6-20020a63d806000000b005dc897045a3mr32893pgh.0.1711494490037; Tue, 26 Mar 2024 16:08:10 -0700 (PDT) Date: Tue, 26 Mar 2024 23:07:57 +0000 In-Reply-To: <20240326230757.282319-1-asoulier@google.com> Mime-Version: 1.0 References: <20240326230757.282319-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240326230757.282319-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: 7yCnFtKMp6Wa Signed-off-by: Antoine Soulier --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index 934241a965..2282f8ca76 100644 --- a/Changelog +++ b/Changelog @@ -37,6 +37,7 @@ version : - Support PacketTypeMetadata of PacketType in enhanced flv format - ffplay with hwaccel decoding support (depends on vulkan renderer via libplacebo) - dnn filter libtorch backend +- LC3/LC3plus decoding/encoding using external library liblc3 version 6.1: