From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A041B4A32A for ; Tue, 26 Mar 2024 17:59:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D29C68CA3D; Tue, 26 Mar 2024 19:59:42 +0200 (EET) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7258C68C14A for ; Tue, 26 Mar 2024 19:59:35 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-56829f41f81so7259439a12.2 for ; Tue, 26 Mar 2024 10:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711475974; x=1712080774; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=b2BRPirU4ttnqzynd6V7jZE/X8bWPLBt12Z61Sm74E0=; b=EBH2FMYFciIISXgWlX4n7PCo+vnLhh8PWeZ87qgBYu0Shcz3dnXkkA4JNhtzys6CbR t8I1ND/rxzKo97fQoDZoO+hMPyAWZMwxQZSVj1Nh0e6Ny9YDhvoMCoOkITsvVx844b/F /H8JdNm9c+M4m9ccULHrPgK2RNOFfTQAshI8umN4D56jhUTmYCUP0DfnCYz+Azg/JxpV qwpLnAJS54DtfQsvBSrPl8mngBlSc/goc0h2E1FpXoN4I7ryzvMd/DVMHAthZ5zFreVA U9NHtNcVsOTZVu5Ri9D8wlYLa0qT4htNuXT5fhlLHA4Oko8ckoB9S4/ENo/pw3HFEWMu Zqng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711475974; x=1712080774; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b2BRPirU4ttnqzynd6V7jZE/X8bWPLBt12Z61Sm74E0=; b=GUI+ZwrKkiHs/hSd/PcKbmdvZYVQPf92azskNcVJcLjIXDJ7SyHi+eY8LQPEdqJw28 YcCmQCejHHjeZKCJ+MZDkHaYZzj5KZCkhSPdWD/K07TzS1q/oMkcrdXMaQVK9AwiuRVC mZ2ERWjFCBvcJqedCP23BNCYHqAW5eMqpwnQJPLJeLHFk/U0QDSLDSJ+oGFoOFu54nHk F/GaoLo6U6kD7wJFVu0mivgViLqJHgLq26NkkLWoJL1I8+rcBRDRCmnQ3ZFmEjXj44kG FPqRTYI2r1PVJPmo5XtNf2DF1Bf5pJ0DYmNWXQeg+SGd6MYCTce133QbJcAvmPIhW69B y9Sw== X-Gm-Message-State: AOJu0YyVa+tLrTcguhKfaXZNI6r2mj7Yzix/K4r0zJIO61+PXLxvvPpm RD3NEvC9W4lJDqkJvvw/oKeqvp+/cV6TIohjH/ykJxcwCpkrx9n06y2FYzEr X-Google-Smtp-Source: AGHT+IFwyOmCPIhXjCBfvzjnW+RA6wXmg3G9CB0yNYdz6YVbKvhYXiu6iYi+oKJz2fNkq+t5W6FmPQ== X-Received: by 2002:a50:cc98:0:b0:56b:ed78:f58 with SMTP id q24-20020a50cc98000000b0056bed780f58mr375109edi.33.1711475973845; Tue, 26 Mar 2024 10:59:33 -0700 (PDT) Received: from mariano (net-93-70-84-101.cust.vodafonedsl.it. [93.70.84.101]) by smtp.gmail.com with ESMTPSA id i10-20020a0564020f0a00b0056c09a0ed79sm3085278eda.11.2024.03.26.10.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 10:59:33 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 26BA4BFCE0; Tue, 26 Mar 2024 18:59:32 +0100 (CET) Date: Tue, 26 Mar 2024 18:59:32 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches , Antoine Soulier References: <20240326164739.153011-1-asoulier@google.com> <20240326164739.153011-3-asoulier@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240326164739.153011-3-asoulier@google.com> User-Agent: Mutt/2.1.4 (2021-12-11) Subject: Re: [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: , Reply-To: FFmpeg development discussions and patches Cc: Antoine Soulier Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On date Tuesday 2024-03-26 16:47:37 +0000, ffmpeg-devel Mailing List wrote: > A file format is described in Bluetooth SIG LC3 and ETSI TS 103 634, for > test purpose. This is the format implemented here. > > Signed-off-by: Antoine Soulier > Signed-off-by: Antoine SOULIER > --- > libavformat/Makefile | 3 + > libavformat/allformats.c | 3 + > libavformat/lc3dec.c | 140 +++++++++++++++++++++++++++++++++++++++ > libavformat/lc3enc.c | 118 +++++++++++++++++++++++++++++++++ > 4 files changed, 264 insertions(+) > create mode 100644 libavformat/lc3dec.c > create mode 100644 libavformat/lc3enc.c > > diff --git a/libavformat/Makefile b/libavformat/Makefile > index 94a949f555..29a38c1d94 100644 > --- a/libavformat/Makefile > +++ b/libavformat/Makefile > @@ -332,6 +332,9 @@ OBJS-$(CONFIG_KVAG_DEMUXER) += kvag.o > OBJS-$(CONFIG_KVAG_MUXER) += kvag.o rawenc.o > OBJS-$(CONFIG_LAF_DEMUXER) += lafdec.o > OBJS-$(CONFIG_LATM_MUXER) += latmenc.o rawenc.o > +OBJS-$(CONFIG_LC3_DEMUXER) += lc3dec.o > +OBJS-$(CONFIG_LC3_MUXER) += lc3enc.o > +OBJS-$(CONFIG_LC3_PLUS_MUXER) += lc3enc.o > OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o > OBJS-$(CONFIG_LOAS_DEMUXER) += loasdec.o rawdec.o > OBJS-$(CONFIG_LUODAT_DEMUXER) += luodatdec.o > diff --git a/libavformat/allformats.c b/libavformat/allformats.c > index e15d0fa6d7..551b0f0d7b 100644 > --- a/libavformat/allformats.c > +++ b/libavformat/allformats.c > @@ -252,6 +252,9 @@ extern const FFInputFormat ff_kvag_demuxer; > extern const FFOutputFormat ff_kvag_muxer; > extern const FFInputFormat ff_laf_demuxer; > extern const FFOutputFormat ff_latm_muxer; > +extern const FFInputFormat ff_lc3_demuxer; > +extern const FFOutputFormat ff_lc3_muxer; > +extern const FFOutputFormat ff_lc3_plus_muxer; > extern const FFInputFormat ff_lmlm4_demuxer; > extern const FFInputFormat ff_loas_demuxer; > extern const FFInputFormat ff_luodat_demuxer; > diff --git a/libavformat/lc3dec.c b/libavformat/lc3dec.c > new file mode 100644 > index 0000000000..563384f786 > --- /dev/null > +++ b/libavformat/lc3dec.c > @@ -0,0 +1,140 @@ > +/* > + * LC3 demuxer > + * Copyright (C) 2024 Antoine Soulier > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/** > + * @file > + * Based on the file format specified by : > + * > + * - Bluetooth SIG - Low Complexity Communication Codec Test Suite > + * https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=502301 > + * 3.2.8.2 Reference LC3 Codec Bitstream Format > + * > + * - ETSI TI 103 634 V1.4.1 - Low Complexity Communication Codec plus > + * https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_103634v010401p.pdf > + * LC3plus conformance script package > + */ > + > +#include > + > +#include "libavcodec/avcodec.h" > +#include "libavcodec/packet.h" > +#include "libavutil/intreadwrite.h" > + > +#include "avformat.h" > +#include "avio.h" > +#include "demux.h" > +#include "internal.h" > + > +typedef struct LC3DemuxContext { > + int frame_samples; > + int64_t position; > + int64_t length; > +} LC3DemuxContext; > + > +static int lc3_read_header(AVFormatContext *s) > +{ > + LC3DemuxContext *lc3 = s->priv_data; > + AVStream *st = NULL; > + uint16_t tag, hdr_size; > + uint16_t frame_us; > + uint32_t length; > + bool ep_mode, hr_mode; I don't think we use bool anywhere > + int srate_hz, channels, bit_rate; > + int num_extra_params, ret; > + > + tag = avio_rb16(s->pb); > + hdr_size = avio_rl16(s->pb); > + > + if (tag != 0x1ccc || hdr_size < 9 * sizeof(uint16_t)) > + return AVERROR_INVALIDDATA; > + > + num_extra_params = hdr_size / sizeof(uint16_t) - 9; > + > + srate_hz = avio_rl16(s->pb) * 100; > + bit_rate = avio_rl16(s->pb) * 100; > + channels = avio_rl16(s->pb); > + frame_us = avio_rl16(s->pb) * 10; > + ep_mode = avio_rl16(s->pb) != 0; > + length = avio_rl32(s->pb); > + hr_mode = num_extra_params >= 1 && avio_rl16(s->pb); > + > + st = avformat_new_stream(s, NULL); > + if (!st) > + return AVERROR(ENOMEM); > + > + avpriv_set_pts_info(st, 32, 1, srate_hz); > + st->duration = length; > + > + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; > + st->codecpar->codec_id = frame_us <= 5000 || ep_mode || hr_mode ? > + AV_CODEC_ID_LC3_PLUS : AV_CODEC_ID_LC3; > + st->codecpar->sample_rate = srate_hz; > + st->codecpar->bit_rate = bit_rate; > + st->codecpar->ch_layout.nb_channels = channels; > + > + if ((ret = ff_alloc_extradata(st->codecpar, 6)) < 0) { > + av_log(s, AV_LOG_ERROR, "Could not allocate extradata.\n"); > + return ret; > + } > + > + AV_WL16(st->codecpar->extradata + 0, frame_us); > + AV_WL16(st->codecpar->extradata + 2, ep_mode); > + AV_WL16(st->codecpar->extradata + 4, hr_mode); > + > + lc3->frame_samples = lc3_hr_frame_samples(hr_mode, frame_us, srate_hz); > + lc3->position = 0; > + lc3->length = st->duration + > + lc3_hr_delay_samples(hr_mode, frame_us, srate_hz); do you know of some way to avoid the lib dependency for the demuxer? Usually we try to avoid the muxer/demuxer depends on the binary (which it cannot be obviously avoided in the case of the codec). > + return 0; > +} > + > +static int lc3_read_packet(AVFormatContext *s, AVPacket *pkt) > +{ > + LC3DemuxContext *lc3 = s->priv_data; > + AVIOContext *pb = s->pb; > + int ret; > + > + if ((ret = av_get_packet(s->pb, pkt, avio_rl16(pb))) < 0) > + return ret; > + > + pkt->duration = lc3->frame_samples; > + lc3->position += lc3->frame_samples; > + if (lc3->position > lc3->length) { > + pkt->duration -= lc3->position - lc3->length; > + lc3->position = lc3->length; > + } > + > + return 0; > +} > + > +const FFInputFormat ff_lc3_demuxer = { > + .p.name = "lc3", > + .p.long_name = NULL_IF_CONFIG_SMALL( > + "LC3 / LC3plus (Low Complexity Communication Codec)"), nit++: weird indent, use a single line > + .p.extensions = "lc3", > + .p.flags = AVFMT_GENERIC_INDEX | > + AVFMT_NOTIMESTAMPS | > + AVFMT_NO_BYTE_SEEK, > + .priv_data_size = sizeof(LC3DemuxContext), > + .read_header = lc3_read_header, > + .read_packet = lc3_read_packet, > +}; > diff --git a/libavformat/lc3enc.c b/libavformat/lc3enc.c > new file mode 100644 > index 0000000000..e6a9ddb35d > --- /dev/null > +++ b/libavformat/lc3enc.c > @@ -0,0 +1,118 @@ > +/* > + * LC3 muxer > + * Copyright (C) 2024 Antoine Soulier > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/** > + * @file > + * Based on the file format specified by : > + * > + * - Bluetooth SIG - Low Complexity Communication Codec Test Suite > + * https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=502301 > + * 3.2.8.2 Reference LC3 Codec Bitstream Format > + * > + * - ETSI TI 103 634 V1.4.1 - Low Complexity Communication Codec plus > + * https://www.etsi.org/deliver/etsi_ts/103600_103699/103634/01.04.01_60/ts_103634v010401p.pdf > + * LC3plus conformance script package > + */ > + > +#include > + > +#include "libavutil/intreadwrite.h" > +#include "libavutil/opt.h" > + > +#include "avformat.h" > +#include "avio.h" > +#include "mux.h" > +#include "internal.h" > + > +static av_cold int lc3_init(AVFormatContext *s) > +{ > + if (s->nb_streams != 1) { > + av_log(s, AV_LOG_ERROR, "This muxer only supports a single stream.\n"); > + return AVERROR(EINVAL); > + } probably you also need to check the codec ID > + > + return 0; > +} > + > +static int lc3_write_header(AVFormatContext *s) > +{ > + AVStream *st = s->streams[0]; > + int channels = st->codecpar->ch_layout.nb_channels; > + int srate_hz = st->codecpar->sample_rate; > + int bit_rate = st->codecpar->bit_rate; > + uint16_t frame_us = 10000; > + bool ep_mode = false, hr_mode = false; ditto [...] _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".