From patchwork Mon Apr 1 21:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47709 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp994858pzb; Mon, 1 Apr 2024 14:32:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWxx4diwiK8V9C07YKGeiadDvkfFtTzMQIAzhuOSmomdRQwZxzKrdJZmflMZUXkIwC+KWVPrGQHzcyi51ZRqbVwD+s+i9E1RS3/Lg== X-Google-Smtp-Source: AGHT+IGPej4n+jRehzeJuIumWbwF7nKt2BGULlmo2j1xQKNwf21CT6+39W5OXsOjztGIQRcgUj0J X-Received: by 2002:a05:6512:3d0a:b0:516:1a1e:164f with SMTP id d10-20020a0565123d0a00b005161a1e164fmr7989124lfv.41.1712007156902; Mon, 01 Apr 2024 14:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712007156; cv=none; d=google.com; s=arc-20160816; b=JtdPoNf3ossYCSJGH6VcBj68p30TVTxUUxX0qMuMHanNRE+Win5b/8BwhnYD9z99o5 CC0dpDI7TKv/zhB0GxswEwi0eUirX7OGaJtdcaLR5q3hQ4Ejcjscuq4o+WRBhxcG4j06 Y0DFofcX31ysLgoO4rZESGhpaYVDTu+pxkeYeJ49/3qc5Svw+P/IpEtgBOMVIbReUHxw e7QBpZyNsNnSQytEcdDIxoRw+YQp+4Yd1IWXwcBRks85eNxzH97KIjxJtXyvxt9W2oUd 5aYJ6OZDb4tvI+CSJZqrGb15qNelLTrN5T3H4x7VHT+BUF6bzRr3jpb/+iCH+eVyjyEf yWOQ== 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=+mERkasUw5nn7YZvnCBL0sNKhOyQ+mOPvD/Yf04LbEU=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=U0PUMRC8YmqNeN3i1KBrxGkXljkww2wtGGm4Jv/woDJUDZ+lETdhf3NWTk4Zw1r1GG td1DCUIZe/AJ1JY0w+CmWcJ4+jnXxx56Chn0muq6TrG5bO86XtN/XmQNmmzBsMk+zPA5 SZDxBkcrA5/2vnd5Fw9MjsnZjSdRqiiivFaS/Rlf5ILIwGr7NOKLVsN/0DmEtVmavKpX kHLA7Uv2kRagNLabfgaag0nwsTvcll63GvJQHVVF6SWQt9jDsjE5LTLKHThbV7qgYdhS LkvGJJ90jDsWtsSzxXxvTT/Y3qenI4OQWg/h9jv+lss/2fpWj40+eft097Dwxvz4gWDO LtFQ==; 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 v20-20020a509554000000b0056c2b47f270si4961526eda.487.2024.04.01.14.32.36; Mon, 01 Apr 2024 14:32:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C530F68CFEC; Tue, 2 Apr 2024 00:32:25 +0300 (EEST) 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 03AB468CF98 for ; Tue, 2 Apr 2024 00:32:19 +0300 (EEST) Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-5e4df21f22dso3430729a12.0 for ; Mon, 01 Apr 2024 14:32:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712007138; x=1712611938; 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=Z8U2Kmb+ua9o/kZJi6R8rqT8DJrQAsMTJFoMlnV70OI=; b=PI0X3aYNtjgj9k1AQOEuZjI8JrTH1dd1kKAhN5yaIzn7jQnSmfnvZB8TZPSNSTzTa7 nkHI/NpRSnUyMu/BtwCAX1hYeysTKR8Y/VTyKFHLj1bcD6UQjpE/lUyP+7mSyUnwFv2x kfdXyo9XTgSTsNQs9FIIMitbBCc3Pq5MQAidBHyEqNp32Q64Na2zZdDy+BmquePCTyRs Kkh7uemhF2nWvPvVjs9KexgVH+3i5GT0bz7c7ahp/cxvRfACCcaDN0j9ifJEQ8Py1ZRL +ls/ArbNr+b+TRVwRaong9bAt7tscdFb/FwvzxVudE/8XwsWviF3ghwxEBKC4e0DOD48 oJHg== X-Gm-Message-State: AOJu0YyHGm4U1c8Ur6BlOtRQM80VEttfuSsuPSDvsYAm8HFElD2CMtb3 Zz8QrxNuvURDABnD5cXOee1cTSiEt0ytxQdn9NmC8XBWfe0Svcd+jP5A6M5HIwxG4WOFsTW5KSu BUwXr4Jio6hEcAgkdCxGoEYsdOslUYI5nfOpLtWEp9IxVuLKCB37ZDndFq7KJJ4w8ye6MXSBEJ9 /mRIyCX2gZvWRh4XiiqixeooeVoA7bC4sDHRp2FDVy7hCX X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a65:4187:0:b0:5dc:1293:c86 with SMTP id a7-20020a654187000000b005dc12930c86mr34080pgq.6.1712007137869; Mon, 01 Apr 2024 14:32:17 -0700 (PDT) Date: Mon, 1 Apr 2024 21:32:05 +0000 In-Reply-To: <20240401213205.2039901-1-asoulier@google.com> Mime-Version: 1.0 References: <20240401213205.2039901-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240401213205.2039901-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: 1PC+5q1rA+v9 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 --- Changelog | 1 + doc/muxers.texi | 6 ++ libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/lc3dec.c | 127 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 100 ++++++++++++++++++++++++++++++ 6 files changed, 238 insertions(+) create mode 100644 libavformat/lc3dec.c create mode 100644 libavformat/lc3enc.c diff --git a/Changelog b/Changelog index 83a4cf7888..08c200a41d 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 - LC3/LC3plus decoding/encoding using external library liblc3 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. 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 9df42bb87a..0b36a7c3eb 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..7232e9847e --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,127 @@ +/* + * 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; +} LC3DemuxContext; + +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; + + 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); + 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, 10)) < 0) { + av_log(s, AV_LOG_ERROR, "Could not allocate extradata.\n"); + 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); + AV_WL32(st->codecpar->extradata + 6, length); + + lc3->frame_samples = av_rescale(frame_10us, srate_hz, 100*1000); + + return 0; +} + +static int lc3_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + LC3DemuxContext *lc3 = s->priv_data; + AVIOContext *pb = s->pb; + int64_t pos = avio_tell(pb); + int ret; + + ret = av_get_packet(s->pb, pkt, avio_rl16(pb)); + if (ret < 0) + return ret; + + pkt->pos = pos; + pkt->duration = lc3->frame_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_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, +};