From patchwork Thu Apr 4 22:57:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47809 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp636029pzd; Thu, 4 Apr 2024 15:57:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJkK1BMDmu48rf5c5ueaw+qF8MLUMeD0dm6pM8YJUxFE/oXtplclXuzBQCEXHqUiirkPguBRWUBlk8Ms2ISwZYa/Lk8ikpSMKi0g== X-Google-Smtp-Source: AGHT+IE7KAVmZ/g6M4mfoXLK344n0c1lcKZXZ2j+Xc5paTQ52fMFMQhkdwjJzal4i5phJSs0oAlT X-Received: by 2002:a17:907:2982:b0:a51:93bb:89c9 with SMTP id eu2-20020a170907298200b00a5193bb89c9mr1138195ejc.6.1712271469735; Thu, 04 Apr 2024 15:57:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712271469; cv=none; d=google.com; s=arc-20160816; b=PUfYux0s6W9m624AI6OZH+NA0KTqc2VaYRI/rMMxlNuTbCqTkbfbvd5LF1Mar/dBBr zlCK+JmKBIhpPzC4tnbVx3G1wjID0zsdQPb8ftXOb9RHG/H2fjCY9/g3S1pX87LH0XmI oO8Ci97FtTOwf8ue+g00IqdiLBp/xr8jbnziiXFqUMwnzcclyHvYFOQdjeupN8QPCNeo eJwKBhUteL8c39ESubuH2r0UOKot7jFK3U70jrp7Cz4cTK4hNMJCIAK9ApcsF3cBQQPd n6N7/hJx4To9V7/1mE4Z7RG3U2ib7bgficg15VS8bXavE/kjSmt2mLGjSU2iM4VG0CNz XRBg== 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=EiB9h/O1CWkKb+3XHhoSj7qGSRHtKeHrU+qH0ZiHUMk=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=Im2HzDC46IJPY+O7ucWBOb6ZFqICCWL+KYg/d2WpA7TzdNqREKkgNOIdi6sazVd0mQ KQlKqpH3M/fnKuNZ3oMji2Vx8qxjqTqZ0mHigep9AbjhA0ap0ysn//srmHsN2JD2nIBk e2SUBIeC4oF8k53oivUj5aDbvIBjMU0NtVSdtgG6NRLCsbWaE7T4MhXMG+GcHgxNHiPE 80ayVOQtgpF53KthRfOCK4g4BzZR00asFzgkV2l/yS68ALwEJ7Ml3kneEfx9v7z7msMp GUCY2Y3GvBRxfju3nF/pOgLaY74aa4i3rU0T4CNSqNhSu2Q6djZWgb2KA9OQM8aRFLMh /KCw==; 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 t21-20020a1709060c5500b00a51943e373csi91314ejf.868.2024.04.04.15.57.49; Thu, 04 Apr 2024 15:57:49 -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 581E168D140; Fri, 5 Apr 2024 01:57:45 +0300 (EEST) 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 E71F868C0CB for ; Fri, 5 Apr 2024 01:57:38 +0300 (EEST) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-ddaf165a8d9so2713140276.1 for ; Thu, 04 Apr 2024 15:57:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712271457; x=1712876257; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4FaBjlAq+OyFRhJnXjMKgEEDqy5ICazLa/0st40ttQ8=; b=MPbDkklAKKJQF4UHMl0ckB5I8b9gGZiJ5It2TatrUUM1Z8DdX45ld+2VVpdA590LE/ hkn5m+QZBlf33EmyfWqgVY5cpe/Z3Ktk/8yRuWUxkv+Slz43q9a+U8I9mIUfYzGWhkX9 KxUsHDASVzf7Q9A/mrK2tJkYaukwUm1PYLLK/hK2zMP8MC9gJvKRdT+T9ZZZ8dvy3l/4 l5AQkKbILwbzeGRYAb1WwJi162btwr8Wgm9fdbqytiiw1h4EpREZnU+Gfr6vLEboc49N LPtsidYdYtNJVcBAAReNan5NyFJ7BdsenH82zXeQ6w2ixJ9ZClpHm4wVRaLOQYPTxzMz NPXQ== X-Gm-Message-State: AOJu0YyBPPaDJQHrMizNQWq/cCpmxwoQ5nm3tHfVLPGZFEpC5YjCdiAE 6l/DYhcdOdVt7uK156N0tjtSn0Q2UyBZ3tWktwqaN7i9bnnQSakZCZHUMwL7n8KmsUa+0Tc/1Cx ayszsRMKWfnzFoN4yyL1J4kTXOUn8DGlQRcKfBDVCrAv+nFxMBRH3tnapV+nQpYFCXPXOn//Ert 8xVrhVH7HXkJzXQr5mbuIWu8pZWAM0UBO7su+cQZHEMnab X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a25:8291:0:b0:dcd:4286:4498 with SMTP id r17-20020a258291000000b00dcd42864498mr110731ybk.6.1712271457234; Thu, 04 Apr 2024 15:57:37 -0700 (PDT) Date: Thu, 4 Apr 2024 22:57:33 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240404225734.3036715-1-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux 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: LYmOtNZOLOXO From: Antoine SOULIER Use the packet duration field to invalid last samples of the last frame. --- libavcodec/liblc3dec.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/liblc3dec.c b/libavcodec/liblc3dec.c index 90da28679b..d250ace38a 100644 --- a/libavcodec/liblc3dec.c +++ b/libavcodec/liblc3dec.c @@ -34,7 +34,6 @@ typedef struct LibLC3DecContext { int frame_us, srate_hz, hr_mode; void *decoder_mem; lc3_decoder_t decoder[DECODER_MAX_CHANNELS]; - int64_t length; } LibLC3DecContext; static av_cold int liblc3_decode_init(AVCodecContext *avctx) @@ -44,12 +43,12 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx) int ep_mode; unsigned decoder_size; - if (avctx->extradata_size < 10) + if (avctx->extradata_size < 6) return AVERROR_INVALIDDATA; if (channels < 0 || channels > DECODER_MAX_CHANNELS) { av_log(avctx, AV_LOG_ERROR, "Invalid number of channels %d. Max %d channels are accepted\n", - channels, DECODER_MAX_CHANNES); + channels, DECODER_MAX_CHANNELS); return AVERROR(EINVAL); } @@ -57,7 +56,6 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx) liblc3->srate_hz = avctx->sample_rate; ep_mode = AV_RL16(avctx->extradata + 2); liblc3->hr_mode = AV_RL16(avctx->extradata + 4); - liblc3->length = AV_RL32(avctx->extradata + 6); if (ep_mode != 0) { av_log(avctx, AV_LOG_ERROR, "Error protection mode is not supported.\n"); @@ -126,11 +124,7 @@ static int liblc3_decode(AVCodecContext *avctx, AVFrame *frame, in += nbytes; } - if (liblc3->length > 0) { - int64_t end_pts = liblc3->length + avctx->delay; - frame->nb_samples = FFMIN(frame->nb_samples, - FFMAX(end_pts - frame->pts, 0)); - } + frame->nb_samples = FFMIN(frame->nb_samples, avpkt->duration); *got_frame_ptr = 1; From patchwork Thu Apr 4 22:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47810 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp636096pzd; Thu, 4 Apr 2024 15:57:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW10bPcaZKxrUo+5czR6LRT3sf7HkcFN3OzonPQVknjKXbRXPOgQyG9QboAHCXnpdRFhy6Pn/xB4zfYdqxdIwhx+miayu7iTHzYog== X-Google-Smtp-Source: AGHT+IE/qJ3QaObtb/LUyfNMRDOtU6jcjNRTX2BzbfXrYklZ6ueu1vHGW/7vL32BBk0oTXroLs4x X-Received: by 2002:a50:cdd7:0:b0:56b:ddcb:bb67 with SMTP id h23-20020a50cdd7000000b0056bddcbbb67mr772972edj.2.1712271479332; Thu, 04 Apr 2024 15:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712271479; cv=none; d=google.com; s=arc-20160816; b=skpEgf/0O5B9fCfai+srYVBaQ3RtiU8Dicw+1NHji5SVlxEdmcctSt7J2gaB/Lcvmp snpaugL84TAK5w3JstkBFAN+oWtEaUrW22nqt6rk+uwHZPN1nBR4hpM0+rzR5LLGhCYK k6BmsVMbehzShfSKm01QqRYj8r8z8GL6MEc+fLzpbjtcZA9HS5RGkxromHVKZn1W1G8s YVMh5z3B7rH9H87l4tq231YtfQK4GfGNtyB96IyLH+89WpusDZhDw2FM44OwG3hWtC+m iiEdd4eRi48QbrjgkNpY8NhgLadIH27f3H/yzFNZ1X99BSH9nKUF0at9ssXF2xuw2oWZ cm8A== 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=cnUJypw0QQLnBTCe4FwI5co5HLgh2jwIaTXXOow+4ps=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=SZbRiDIafT2AXJHRR997cJqJ6d0xzKxmn3k5HWITvQm07P+Sb1/oNO891k7JPWrnp2 y8yClKihRXd2ZgCq9mY95/avoDOa6o1DOrmG4Kz7oINpXusthJn4SFyxElAWPOTNkxoZ iFU1cGRZQtO00QT7WgCUE8ZOliudVmcJ8dh5ZYpnoLGIyCuyrAtYOtFzkDhxEPWswXhF DCesLgw6jjA0j9hEBbV83LCj+I1RWsXs6hBCfoS2C++a1ccP0Fe0K9qVPz8P71BxDbv2 2c9n/QDZWHHfVS7tdpPHWAtsQ2fHgPGzwFMYuk1bnal0G6LGbab0OCEiBqbWzg/34PhW CTIQ==; 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 eb7-20020a0564020d0700b0056e2a157a9bsi115190edb.552.2024.04.04.15.57.58; Thu, 04 Apr 2024 15:57:59 -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 72AC868CF0E; Fri, 5 Apr 2024 01:57:47 +0300 (EEST) 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 6FA3868D158 for ; Fri, 5 Apr 2024 01:57:40 +0300 (EEST) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6152135cd23so23167057b3.0 for ; Thu, 04 Apr 2024 15:57:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712271459; x=1712876259; 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=UsPZq+s85IMG+SB7eGMmaXof4Vp3ymPNWZf2PAqODSM=; b=KKeTVEQ7IKBixiZtvb5aWwicTlOfADU6R7UFJF+h7t6mJ+m8H9WxGKDsO7T0nuYND9 6lpnGlUDWMuYR2STvZIV7MJIuVhRFuruCtGzMpNhGB8eUyPCTxgui4JnEY2iH7eRHMyt ge++JI20t81JRM/nMvFDiBh9LUUH+4nde7YcAGg8+pAaQAUu1miaNSV6O9ljvkEXQaIZ i126t4bWyPawff1oG1hJezyMwYOb6DU25ZkWsiwQogyy/eTegmvxu6NwSaSPRvncWbmC I4KnVmbOoJYid8dpRGhoBpCGLivlNZN80yhyJ2uEfN6pmX4Lr+sGeg0AguKZLTLKZRTV BiPA== X-Gm-Message-State: AOJu0Yyw2M6Z+DqBvC5jx6M7uYJ552xfgi5DaMOw1Dhc5G8GB6W4sw0w XnBaT3PaK3SiEAG/OLdd/SwTnomW8t8LXB0LLfPQjMRYthbPyyzkCsnEnr/KuVSwQWqxiXTB0xV C+Ggyau367Zso8P8Dc7Ni9rvDCpjiE3Wgk/VgWEUDns2bPXo/t9hTEj4rrPw8UWRmCis7ZSTV2D UaOMU/fUtldjN/0EUrTNvLOt9IfZMLMhStU+GNL3PEg4b0 X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:2746:b0:dcc:8927:7496 with SMTP id ea6-20020a056902274600b00dcc89277496mr62320ybb.5.1712271458784; Thu, 04 Apr 2024 15:57:38 -0700 (PDT) Date: Thu, 4 Apr 2024 22:57:34 +0000 In-Reply-To: <20240404225734.3036715-1-asoulier@google.com> Mime-Version: 1.0 References: <20240404225734.3036715-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240404225734.3036715-2-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/2] 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: nfGdxSuwnwSH From: Antoine SOULIER A file format is described in Bluetooth SIG LC3 and ETSI TS 103 634, for test purpose. This is the format implemented here. --- Changelog | 1 + doc/muxers.texi | 6 ++ libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/lc3dec.c | 160 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 100 ++++++++++++++++++++++++ 6 files changed, 271 insertions(+) create mode 100644 libavformat/lc3dec.c create mode 100644 libavformat/lc3enc.c diff --git a/Changelog b/Changelog index 18e83b99a1..92670f6a05 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 demuxer and muxer - Raw Captions with Time (RCWT) closed caption demuxer - LC3/LC3plus decoding/encoding using external library liblc3 diff --git a/doc/muxers.texi b/doc/muxers.texi index d8a1f83309..ed4144f6d1 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2700,6 +2700,12 @@ computer-generated compositions. This muxer accepts a single audio stream containing PCM data. +@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. diff --git a/libavformat/Makefile b/libavformat/Makefile index 9981799cc9..027d0cdae5 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 ae925dcf60..305fa46532 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..1fcde8ca4e --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,160 @@ +/* + * 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 end_dts; +} LC3DemuxContext; + +static int lc3_read_probe(const AVProbeData *p) +{ + uint16_t frame_10us, srate_100hz; + + if (p->buf_size < 12) + return 0; + + if (AV_RB16(p->buf + 0) != 0x1ccc || + AV_RL16(p->buf + 2) < 9 * sizeof(uint16_t)) + return 0; + + srate_100hz = AV_RL16(p->buf + 4); + if (srate_100hz != 8000/100 && srate_100hz != 16000/100 && + srate_100hz != 24000/100 && srate_100hz != 32000/100 && + srate_100hz != 48000/100 && srate_100hz != 96000/100) + return 0; + + frame_10us = AV_RL16(p->buf + 10); + if (frame_10us != 2500/10 && frame_10us != 5000/10 && + frame_10us != 7500/10 && frame_10us != 10000/10) + return 0; + + return AVPROBE_SCORE_MAX; +} + +static int lc3_read_header(AVFormatContext *s) +{ + LC3DemuxContext *lc3 = s->priv_data; + AVStream *st = NULL; + uint16_t tag, hdr_size; + uint16_t frame_10us; + uint32_t length; + int ep_mode, hr_mode; + int srate_hz, channels, bit_rate; + int num_extra_params, ret; + int delay; + + 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_10us = avio_rl16(s->pb); + 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, 64, 1, srate_hz); + avpriv_update_cur_dts(s, st, 0); + 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) + return ret; + + AV_WL16(st->codecpar->extradata + 0, frame_10us); + AV_WL16(st->codecpar->extradata + 2, ep_mode); + AV_WL16(st->codecpar->extradata + 4, hr_mode); + + lc3->frame_samples = av_rescale(frame_10us, srate_hz, 100*1000); + + delay = av_rescale(frame_10us == 750 ? 400 : 250, srate_hz, 100*1000); + lc3->end_dts = length + delay; + + return 0; +} + +static int lc3_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + LC3DemuxContext *lc3 = s->priv_data; + AVStream *st = s->streams[0]; + AVIOContext *pb = s->pb; + int64_t pos = avio_tell(pb); + int64_t remaining_samples; + int ret; + + ret = av_get_packet(s->pb, pkt, avio_rl16(pb)); + if (ret < 0) + return ret; + + pkt->pos = pos; + + remaining_samples = FFMAX(lc3->end_dts - ffstream(st)->cur_dts, 0); + pkt->duration = FFMIN(lc3->frame_samples, remaining_samples); + + 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, + .priv_data_size = sizeof(LC3DemuxContext), + .read_probe = lc3_read_probe, + .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..e768212f63 --- /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; + int frame_us, ep_mode, hr_mode; + uint32_t nb_samples = av_rescale_q( + st->duration, st->time_base, (AVRational){ 1, srate_hz }); + + if (st->codecpar->extradata_size < 6) + return AVERROR_INVALIDDATA; + + frame_us = AV_RL16(st->codecpar->extradata + 0) * 10; + ep_mode = AV_RL16(st->codecpar->extradata + 2) != 0; + hr_mode = AV_RL16(st->codecpar->extradata + 4) != 0; + + 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, +};