From patchwork Fri Mar 29 17:30:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47657 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2117767pzb; Fri, 29 Mar 2024 10:30:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbW4GCYRMdW5aYFcEpI6tfVly3uVGB8+1cu9np2nyv/8l+bez1OruTQ52HNs0+xtACklvL0q7yRZVkbebaqz/1rAn9IzIp7pO3uA== X-Google-Smtp-Source: AGHT+IEI+bLBawQYuB8G922oIV7y4fseUW1duK2XBzVFHgQz9EFD09k2xSv05q6LndlinR5fg4e+ X-Received: by 2002:a17:906:a112:b0:a46:ea3c:72ab with SMTP id t18-20020a170906a11200b00a46ea3c72abmr1944746ejy.74.1711733457097; Fri, 29 Mar 2024 10:30:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711733457; cv=none; d=google.com; s=arc-20160816; b=eA1b4PKyIuv8j8UABQIxxC3u0ARpiyVR7h5vRV5Rqq3tyLcbtuzcgc1iFOguLxILP2 g2w7oGaxzfsf+m5mQi0hCAstiwAk+aPd+9BtuDk1GkzMq/HgSPaDxmGoMTfn/5WCFU0q BClj0Caj880HvBeG+G1m5PFzmKZkYD8R45MXcMfVnxo/cR5JWox+iQny50pGrcLVcl7p hUfIcHAAYdGhTOMbrCJcif0nHI2+GgdeaGVGr1fxYtBuiQpvnUntZ5fdjvoW4DEeqx0Z yH5tm3kP4VYBr/8yhPirJuXKx/QXuNiLobbVoWp1RtaY8GihXU5u2OXtmdsZXopM1zwN BBkA== 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=BzkZmEsakM80GaqR8irRGsTXDqTXynxyEcA8NJs2bOc=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=AgMLJ7+TepdnR1Pm3O6m+u+WsBYdyrbA/lKP/T+0f8brApesoP7s/bVyIEKSeNsMgK 6O2bz1zkd9b/m0Nxn9bRvAwCspGMumLyV8sNv/l/AePGq9B4uZWNFgkymkEiBkeHJmYp fWIeuaTGgIrptj4Mo/O9sNt+v1hqgYE8ng9iy9/uvnbKQhGo8CZjlp2Ih3401FSCunZ5 f8LxB/29zM8u/BfPsH80ZlTDvcw5gE6pTTegeRp/ony+c7KBgERhapCSs6kKfod2EuRx e8WN1N0E1vkvZcClMKdY/olz5bS5sbJlzgQgcB+d05LZ5Qnsl7p/kLDesFmSZ9TBD9OG zHkw==; 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 t18-20020a170906065200b00a462a5a4948si1913295ejb.276.2024.03.29.10.30.56; Fri, 29 Mar 2024 10:30:57 -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 7045168D776; Fri, 29 Mar 2024 19:30:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9877368D28A for ; Fri, 29 Mar 2024 19:30:40 +0200 (EET) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcd94cc48a1so3381995276.3 for ; Fri, 29 Mar 2024 10:30:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711733439; x=1712338239; 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=cX/ughgzNXUa/6jyDB3bCOsNQANpC0o9MXQL9hPWcyw=; b=h/xfuXV9n5ejl+CtV/85RcjC4cfs4gIMuWNjX/RYf+FtaT03hpmpPrzxiROLx6XSAN XM0ICqEb5X5V/Pdz9/8QoXHP9XwIITSXivn5UMTUBlDDLM7oDrhqVUDiZvL4/AnEupIE gx4snFHQ8jNIhVf0bs5qVcdYfU5KrPYk+5vUpZTI5RNgGUpYtIFGcHzpzA+VeIMl20nK kOJXTacD0h2ADF6qVz0xqGqbKvqO8VWdPIdixJO3NyOKj0ENf1/ekFC+oTJs4oV0CK4Y Yhm6nmJm0hu2t58duzFd/If38JEpcF1KTux4FLqrBvbAqjn12jRbwwmxt7e3Tj4m1QbP L5RQ== X-Gm-Message-State: AOJu0YycAT4DBF4MkkR5Ftip8eDdIAxpGvya5TNLPnir+zVQ72o3IF07 qnYioxM5t4t6vAlbpVGrYLzXT3yd0YxF7pzyTSib+p2enSnfhf8jDjsHBB6pv4PI5WasVlofEov D72PBudizk10KdRdfLIXhfYdRknycwny6cXnVT/1lMLWBnIdpb6ExD1wNOnchfjFnPMiRcHuNpc 6Kf8L+WVPM4D/GoM/K/yFDqZzqTnBONyMb5se8SFW2mxMZ X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a05:6902:1006:b0:dd9:4ad1:a1f7 with SMTP id w6-20020a056902100600b00dd94ad1a1f7mr850515ybt.9.1711733439215; Fri, 29 Mar 2024 10:30:39 -0700 (PDT) Date: Fri, 29 Mar 2024 17:30:31 +0000 In-Reply-To: <20240329173032.1122372-1-asoulier@google.com> Mime-Version: 1.0 References: <20240329173032.1122372-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240329173032.1122372-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: 5RxJGlsOz7Mt 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 | 164 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 100 ++++++++++++++++++++++++ 6 files changed, 275 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..74d6794d00 --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,164 @@ +/* + * 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 dt, delay; + int64_t timestamp; + 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_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->start_time = 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) { + 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); + + lc3->dt = av_rescale(frame_10us, srate_hz, 100*1000); + lc3->delay = av_rescale(frame_10us == 750 ? 400 : 250, srate_hz, 100*1000); + + lc3->timestamp = -lc3->delay; + lc3->length = st->duration; + + 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->pos -= 2; + pkt->pts = FFMAX(lc3->timestamp, 0); + pkt->duration = lc3->dt; + + lc3->timestamp += lc3->dt; + if (lc3->timestamp > lc3->length) { + pkt->duration -= lc3->timestamp - lc3->length; + lc3->timestamp = lc3->length; + } + + return 0; +} + +static int lc3_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) +{ + AVStream *st = s->streams[stream_index]; + FFStream *const sti = ffstream(st); + LC3DemuxContext *lc3 = s->priv_data; + const AVIndexEntry *ie; + int index; + + timestamp = FFMAX(timestamp - lc3->delay, 0); + if (timestamp >= lc3->length) + return AVERROR_EOF; + + index = av_index_search_timestamp(st, timestamp, flags); + ie = index < 0 ? NULL : &sti->index_entries[index]; + if (!ie || avio_seek(s->pb, ie->pos, SEEK_SET) < 0) + return -1; + + lc3->timestamp = ie->timestamp; + if (lc3->timestamp == 0) + lc3->timestamp -= lc3->delay; + + 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, + .read_seek = lc3_read_seek, +}; 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, +};