From patchwork Sat Apr 6 21:08:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1712685pzd; Sat, 6 Apr 2024 14:08:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRL2sH2R7ta/uJdZc/M7nxRSMmSGeqn9QmcPmFJjQPkClLtaZHzfnlVJ6xf1Aw56nzgVOBJkaczeBofS5luRU6iHflN2jjQBui/A== X-Google-Smtp-Source: AGHT+IGhOSCV7yZJYhd/6GRta9BbkCXH+ftu34ZDdlZAos/9ssmtk4CJIkVg6q5lPVu6ir7rXuOg X-Received: by 2002:a50:d5d4:0:b0:56c:18b4:d2ab with SMTP id g20-20020a50d5d4000000b0056c18b4d2abmr3660847edj.42.1712437716903; Sat, 06 Apr 2024 14:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712437716; cv=none; d=google.com; s=arc-20160816; b=dkj5wThbJskdWflA902ISyKGC74WSioGtlCa4wAmai8DbltNivSKH7QqWT2UZLEekB 55hY9vfsxeJluKSGecXQnGKT0hHmssXImgvgC2BAyZ6dSpFeQfdoSKBIYaeQBQqE9eYU OdYkh2gQ6aeausx0XXifjRz58dsoLNlpEm0tJyx4NptKxmDVu+LzKzX4vVE0wAr4Q43I Gdtz6FP1btaFg5GknHHIfPirVP+/AY2FrSg/8RkTVRagxXPGwRxOKqVps0h9LWGAAti2 6z/tyLmamxs5/6dQBMmIBB0dLP9oYz4Lr9JC14rH8LpFjm2W/+RGUk+yAkH3Nw0at9zU fhkw== 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=ETDBFNX4JpSvelr8ny4BX8XVDlUDBbySZ6Z4F800EzQ=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=czl9pS8JoFdcSoW9emWbe1YBZJSxFiQMRKlw7aTqVxxCEBbbIsjwhPyCxGm+HgNirU 6ZHNKL+L8E+hDSf1pNDJotqYoIGcNhAK16oEJ7ci+w4bxzw0rYGE+qrRe5HoA5Wk6UWo l9VHBGpRVPnX4rZL1HbQjW5dOXl9UXyWtZzTAm9Y8SLx7TTf8yikeZ/unK6nrsGSlWNk 0FHWZ8peX5zEPiZIx6IdUDQ4smxfd0T9mvNnWx5qljdPfZXApdgQR8+br3VCur1riHFr 8TQ8FolH2fc5gV0QOn7FcWqIEknK/ddy4fFTdcM7EI8v6iItV9t/2LoyJCxdEQKGySPv uA/A==; 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 m27-20020a50999b000000b0056c3b5d0befsi2130737edb.88.2024.04.06.14.08.35; Sat, 06 Apr 2024 14:08: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 E146368D026; Sun, 7 Apr 2024 00:08:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41C5E68C1BC for ; Sun, 7 Apr 2024 00:08:25 +0300 (EEST) Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-5c17cff57f9so2261369a12.0 for ; Sat, 06 Apr 2024 14:08:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712437703; x=1713042503; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Q18msN8mrw947zUbC3flmyPN+vclgOh3piUQhxaQxio=; b=vBANqWmi6xG+kRIG03PpmAl1eP7CcC0h5UGsxRlwzfPKvHbG2VqDxwVeTrgnt3BiAX 8wV60rVnDDQ/upktMW5XnZFbsL6ImOsnoHHxGv2t7NId1RVmMfrdKE/ouJJ+mj2YNPqc O7frgFQy9JJxLPhjcINPzpJtqA8yIP4qhE0b9IbnCKr1wUpcNCeRyOtK134zdnTtv9iG 9EmoiWDvGvPT7UoQJErG5KtkJpd1jtdCLPwFUezdSVuhoHlH7oXLJ8WTw0u99CESM95+ FwqrGbYdG3FrvBfidGBciN7JMmOfqRbacCccQ3XvzhwypB2jFDxg8czCCUSj0ivOh5Z1 Tpwg== X-Gm-Message-State: AOJu0YwsDX/q/UGzO20BagH2BaEOuy0/eQowe+Chx0TivPuSYBfjnb/7 TeDMJ3V8Wh3OGrwkN57k467ABDH4EiAWqeL43QwauTpeyr5V7/7LSGJkinZtgxGE+Rb7hcYlngU YwThjqvaZiVoxwtPcPvWpvDqJIjZn+vNd+A2AbnzbR9VScjgES8sR/rCJn5dzPA7/puEsFeV1IZ U9gbocabS95q1BGiWEdqOxcQU+XgQTSuyVvVDGcxxBpc/j X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a63:de44:0:b0:5ca:459f:d4ba with SMTP id y4-20020a63de44000000b005ca459fd4bamr15021pgi.9.1712437702547; Sat, 06 Apr 2024 14:08:22 -0700 (PDT) Date: Sat, 6 Apr 2024 21:08:19 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240406210819.815572-1-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] 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: h4IBT1Y4D1B+ 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 | 173 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 114 ++++++++++++++++++++++++++ 6 files changed, 298 insertions(+) create mode 100644 libavformat/lc3dec.c create mode 100644 libavformat/lc3enc.c diff --git a/Changelog b/Changelog index 18e83b99a1..02ed7831ec 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ releases are sorted from youngest to oldest. version : - Raw Captions with Time (RCWT) closed caption demuxer - LC3/LC3plus decoding/encoding using external library liblc3 +- LC3/LC3plus demuxer and muxer version 7.0: 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..371e9242d5 --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,173 @@ +/* + * 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) +{ + int frame_us, srate_hz; + + 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_hz = AV_RL16(p->buf + 4) * 100; + if (srate_hz != 8000 && srate_hz != 16000 && srate_hz != 24000 && + srate_hz != 32000 && srate_hz != 48000 && srate_hz != 96000) + return 0; + + frame_us = AV_RL16(p->buf + 10) * 10; + if (frame_us != 2500 && frame_us != 5000 && + frame_us != 7500 && frame_us != 10000) + 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; + uint32_t length; + int srate_hz, frame_us, channels, bit_rate; + int ep_mode, hr_mode; + int num_extra_params; + int delay, 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); + + if (srate_hz != 8000 && srate_hz != 16000 && srate_hz != 24000 && + srate_hz != 32000 && srate_hz != 48000 && srate_hz != 96000) { + av_log(s, AV_LOG_ERROR, "Incompatible LC3 sample rate: %d Hz.\n", + srate_hz); + return AVERROR_INVALIDDATA; + } + + if (frame_us != 2500 && frame_us != 5000 && + frame_us != 7500 && frame_us != 10000) { + av_log(s, AV_LOG_ERROR, "Incompatible LC3 frame duration: %.1f ms.\n", + frame_us / 1000.f); + return AVERROR_INVALIDDATA; + } + + 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_us / 10); + AV_WL16(st->codecpar->extradata + 2, ep_mode); + AV_WL16(st->codecpar->extradata + 4, hr_mode); + + lc3->frame_samples = av_rescale(frame_us, srate_hz, 1000*1000); + + delay = av_rescale(frame_us == 7500 ? 4000 : 2500, srate_hz, 1000*1000); + lc3->end_dts = length ? length + delay : -1; + + 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 = lc3->end_dts < 0 ? lc3->frame_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..d3f823d6bb --- /dev/null +++ b/libavformat/lc3enc.c @@ -0,0 +1,114 @@ +/* + * 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; + + if (srate_hz != 8000 && srate_hz != 16000 && srate_hz != 24000 && + srate_hz != 32000 && srate_hz != 48000 && srate_hz != 96000) { + av_log(s, AV_LOG_ERROR, "Incompatible LC3 sample rate: %d Hz.\n", + srate_hz); + return AVERROR_INVALIDDATA; + } + + if (frame_us != 2500 && frame_us != 5000 && + frame_us != 7500 && frame_us != 10000) { + av_log(s, AV_LOG_ERROR, "Incompatible LC3 frame duration: %.1f ms.\n", + frame_us / 1000.f); + return AVERROR_INVALIDDATA; + } + + 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, +};