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 886FF49157 for ; Thu, 4 Apr 2024 16:23:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A65B68D0D9; Thu, 4 Apr 2024 19:23:43 +0300 (EEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44BA368CC1C for ; Thu, 4 Apr 2024 19:23:36 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1e28be94d32so9099415ad.0 for ; Thu, 04 Apr 2024 09:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712247813; x=1712852613; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=0Af+9SEP6IX5ZWpVRIEStsF3pXIVfkkDWWCSCUhiafM=; b=DVtCx0toolNh2ocRmogqpi/F+kG6S40dxkrUZCdf1Qe54eFRJFJR/weMART9wlpmbH a1VZqfmqxO0PGsUh32LHW/2/dYhLBt9uiaPsqi/DZCJkXj2hUZY/VwVNOStLSNxtZUUn xpynPLUVhmB4910m/yK2jIwgHWANjB2VYogPbiiTHavv4DkKqeL+e1r6uz2/G5PtMZKX G0pvflDqy12QYJMAm5xwv4DlITTv6ZWu4tgnYeHa7TVG9hoydsTdaFBT9rtdnhUipnCc CysI2GCLYT+awUYcZHqdpXn68Ff8mJtVWIJkI3BBb0L0LOucYLiGIobG7q+BHwKBgu0q 5wqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712247813; x=1712852613; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0Af+9SEP6IX5ZWpVRIEStsF3pXIVfkkDWWCSCUhiafM=; b=m1PyZNoIXOpcLjZwfiyFr8h7fCjEB0VV5QSgdyD+ZHHqjb0TJVnfLd8jaMjYIgLqW9 Vz0j68I9yC7kKwdNsQ0swhn1pyLGSy1CQS+NM8+8Lq/61/PK16jdxCWQta+t2f04hPb0 BbQA7xJvURqYu29Q0zkuIvr4lbo8PZS+ahtw6MMT/AmHY3V6nBb3aRtbN9CME9gjaayW LdH1mRATY/OSjW6hdViZM87ZAa53TguTCHj/UA6zUlLpkPdp/iw/EAZD09UcRzJSX93l jYConSeR5B3WyIRjCr1eMHSFFe9Eb+tzb2RgBqMqKjutQ9qq6zx8NMfIAFmBzWTlGF9W MzNg== X-Gm-Message-State: AOJu0Yw/JgZjyP0g2STe3Uf49LQx6K8g6i57Fn6hINQxa7Nma+Oh6LS6 U//1y/eW1oIxLIjCAYr3QYZYc5kvcdivI88WvQVpoczjrdrY94revWWWZgJ+ X-Google-Smtp-Source: AGHT+IGmmmLnsBDrc0ix9tmKIcBIHLUTevjrBhj9XuZLu3xkSflXIHvSRR7XORvpwpNXTPPI6cPpSA== X-Received: by 2002:a17:902:ecc4:b0:1e2:97f1:87eb with SMTP id a4-20020a170902ecc400b001e297f187ebmr3751344plh.34.1712247812744; Thu, 04 Apr 2024 09:23:32 -0700 (PDT) Received: from [192.168.0.15] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id z10-20020a170903018a00b001e26b7d3e8dsm1775028plg.266.2024.04.04.09.23.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Apr 2024 09:23:32 -0700 (PDT) Message-ID: <7ef1e45d-c285-4a6e-a7e8-127e749ff54d@gmail.com> Date: Thu, 4 Apr 2024 13:23:50 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240401213205.2039901-1-asoulier@google.com> <20240401213205.2039901-2-asoulier@google.com> Content-Language: en-US From: James Almer In-Reply-To: <20240401213205.2039901-2-asoulier@google.com> Subject: Re: [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: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/1/2024 6:32 PM, Antoine Soulier via ffmpeg-devel 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 > --- > 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, This needs a probe function. _______________________________________________ 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".