From patchwork Fri Mar 22 17:01:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Soulier X-Patchwork-Id: 47319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp42141pzb; Fri, 22 Mar 2024 10:01:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8NwuCAo17M3Snnb8GJZi8GJZOR0d6uT6hV3JPfwzSoSB7q/1pESiQsQgF2yia7Hdn/bx/J/ONpTanGEoSmtURHAtAqvy3LB/Qmg== X-Google-Smtp-Source: AGHT+IETH5r5rPHmqDuEsLDeJoSB8MnTpYwG+N/HUR8nbocmdKbGitZPFKTHf33ndKDPhvF3jEhB X-Received: by 2002:a17:906:a008:b0:a46:ba8f:bcd4 with SMTP id p8-20020a170906a00800b00a46ba8fbcd4mr248861ejy.46.1711126896248; Fri, 22 Mar 2024 10:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711126896; cv=none; d=google.com; s=arc-20160816; b=aekSnEbNqKQPRYWM5rqwyQPcjGSNeaiq75WCrbjS224iutsPAAJhcUyhbUVCOguCIu vll95nhKbZMxAzmqfpENVtdYa/RTE3hj/73n+tM+bccGg3szILpzMuiA/1Ljrq/sl4Pb 7yYfLgZCekLWkcjFenXnAHHeWpddxA4Y/WwlQpciSuTzY2+JYiAyffqXwpZ8n4xuFIzK GMqsHuMJKSmooHFH3R0b77L1L0g7bnfWer8qp/xZPDN3Wk9QCU3ZGTicBPAn2r42EgoD SVQP4iPvzjbFU4Bx4yAGn/Vt+spEiBfQ8kySjoPVvA+8tr0hiD6/WRZ5ys7n39ejENNJ qqfw== 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=RR+Vddq00evOpljglNa8g4PL6daH8y2RH9hQLR0NdBI=; fh=eZJQwGgFNmhG1aNRPvwNmWJ7Br90d3O+ZTyD+wYtFmA=; b=FuSg97MnT0G1Qs2Q0KrfADDeycKzSQlZ+bzDkU6FimSgrTrKGlYYPZK59xiXcnRs34 ZZMHYABpnskACJqZEoIorwmmqSwbzXY/ZGAdh6mfoTXt6hjrDtL6Oh5sP0Vl+VSKXupk KQsQtRl7/rBLyK+uAfqbov8A/mG7uzYeMKPR6SuVm9jr4dr0N+Ie2H0TbwajtOUD1/xo uQMfuayF37tvy5SeLxgUyO+ipaR+leDCiopx1gQUfEIFZ9pSD1uixhCGZXlqkJNRXlSW m83MqWSPh8M+xVNVWUhFSJrtVrW5q7BUWA+WL1jpvVyHTeBc0fJjYrzKMbWI4vq8EjCF GMyA==; 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 e5-20020a170906314500b00a46f99d910esi12013eje.634.2024.03.22.10.01.33; Fri, 22 Mar 2024 10:01: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 8623468D57A; Fri, 22 Mar 2024 19:01:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B860968D4BC for ; Fri, 22 Mar 2024 19:01:16 +0200 (EET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dd0ae66422fso4533245276.0 for ; Fri, 22 Mar 2024 10:01:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711126875; x=1711731675; 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=sLn7+27sMUjG5Z+y3Z6bI9LQObeEotTRxazW6x7SfPI=; b=nEH89OSBSXZlGk3AQUxyP9Cdgj41NBJVRBtLQ74rKOop1k5vDarNHCoQ5vYVJy0LAU P9CtFu1JJbhp48BTaN+meVYdfERHv44UxpPxdsruLn7LX2oe4uFc72JAxxrAGjIWiDi6 bKMxfSGU7MFVKGqOoMGUJq7ogKm7suaGrI3FWQQZjZVl3C4CLy/W9y//xi9oERBe57+y VWCqbDhWZgV7Z7Fb96CnZsmH+hfwhrmO0gMkq2NRXomrp7sPt2U/n1ogun1ylvga8pw6 dcGZHUAjHAS07Tqk7+FmTX80DvnCWOI0JZqIUBZZ+9em2O2JpC1fXYTlBabe4r21gAdD fOgA== X-Gm-Message-State: AOJu0Yx/1T5N5Qj4fELAEAC7D517JUepp4EA5ouAUQqLN9Ef12tbv5cZ 0qGUK4e9zu5hXA9gwHxRi7TNGT1/z05FSyrUvp6IS/GEPGSL6QrcH1JEwO+BQGqqvlxAxvTc8Ad o3PPBlVOeO3ddWdGFB6UhxNQXd8G2IoX1T6dAH7NqoSgRLUrRvuBAhA1NxS4qp975kx0bZNyPyf gScR/jcAqSoZ+80xGZJcKsT5adbmhyfNmrif2nmvpE72hX X-Received: from asoulier-us.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:f79]) (user=asoulier job=sendgmr) by 2002:a25:1903:0:b0:dc6:deca:8122 with SMTP id 3-20020a251903000000b00dc6deca8122mr540170ybz.5.1711126874946; Fri, 22 Mar 2024 10:01:14 -0700 (PDT) Date: Fri, 22 Mar 2024 17:01:01 +0000 In-Reply-To: <20240322170106.2243608-1-asoulier@google.com> Mime-Version: 1.0 References: <20240322170106.2243608-1-asoulier@google.com> X-Mailer: git-send-email 2.44.0.396.g6e790dbe36-goog Message-ID: <20240322170106.2243608-2-asoulier@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/6] 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: u4Nu+/38cFr2 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; + 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); + + 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)"), + .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); + } + + 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; + uint32_t nb_samples = av_rescale_q( + st->duration, st->time_base, (AVRational){ 1, srate_hz }); + + if (st->codecpar->extradata_size >= 2) + frame_us = AV_RL16(st->codecpar->extradata + 0); + if (st->codecpar->extradata_size >= 4) + ep_mode = AV_RL16(st->codecpar->extradata + 2); + if (st->codecpar->extradata_size >= 6) + hr_mode = AV_RL16(st->codecpar->extradata + 4); + + 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, +}; + +const FFOutputFormat ff_lc3_plus_muxer = { + .p.name = "lc3_plus", + .p.long_name = NULL_IF_CONFIG_SMALL( + "LC3Plus (Low Complexity Communication Codec plus)"), + .p.extensions = "lc3", + .p.audio_codec = AV_CODEC_ID_LC3_PLUS, + .p.video_codec = AV_CODEC_ID_NONE, + .p.flags = AVFMT_NOTIMESTAMPS, + .init = lc3_init, + .write_header = lc3_write_header, + .write_packet = lc3_write_packet, +};