* [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux @ 2024-04-04 22:57 Antoine Soulier via ffmpeg-devel 2024-04-04 22:57 ` [FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport Antoine Soulier via ffmpeg-devel 2024-04-06 7:41 ` [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux Stefano Sabatini 0 siblings, 2 replies; 4+ messages in thread From: Antoine Soulier via ffmpeg-devel @ 2024-04-04 22:57 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Antoine Soulier From: Antoine SOULIER <asoulier@google.com> Use the packet duration field to invalid last samples of the last frame. --- libavcodec/liblc3dec.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/liblc3dec.c b/libavcodec/liblc3dec.c index 90da28679b..d250ace38a 100644 --- a/libavcodec/liblc3dec.c +++ b/libavcodec/liblc3dec.c @@ -34,7 +34,6 @@ typedef struct LibLC3DecContext { int frame_us, srate_hz, hr_mode; void *decoder_mem; lc3_decoder_t decoder[DECODER_MAX_CHANNELS]; - int64_t length; } LibLC3DecContext; static av_cold int liblc3_decode_init(AVCodecContext *avctx) @@ -44,12 +43,12 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx) int ep_mode; unsigned decoder_size; - if (avctx->extradata_size < 10) + if (avctx->extradata_size < 6) return AVERROR_INVALIDDATA; if (channels < 0 || channels > DECODER_MAX_CHANNELS) { av_log(avctx, AV_LOG_ERROR, "Invalid number of channels %d. Max %d channels are accepted\n", - channels, DECODER_MAX_CHANNES); + channels, DECODER_MAX_CHANNELS); return AVERROR(EINVAL); } @@ -57,7 +56,6 @@ static av_cold int liblc3_decode_init(AVCodecContext *avctx) liblc3->srate_hz = avctx->sample_rate; ep_mode = AV_RL16(avctx->extradata + 2); liblc3->hr_mode = AV_RL16(avctx->extradata + 4); - liblc3->length = AV_RL32(avctx->extradata + 6); if (ep_mode != 0) { av_log(avctx, AV_LOG_ERROR, "Error protection mode is not supported.\n"); @@ -126,11 +124,7 @@ static int liblc3_decode(AVCodecContext *avctx, AVFrame *frame, in += nbytes; } - if (liblc3->length > 0) { - int64_t end_pts = liblc3->length + avctx->delay; - frame->nb_samples = FFMIN(frame->nb_samples, - FFMAX(end_pts - frame->pts, 0)); - } + frame->nb_samples = FFMIN(frame->nb_samples, avpkt->duration); *got_frame_ptr = 1; -- 2.44.0.478.gd926399ef9-goog _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport 2024-04-04 22:57 [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux Antoine Soulier via ffmpeg-devel @ 2024-04-04 22:57 ` Antoine Soulier via ffmpeg-devel 2024-04-06 7:54 ` Stefano Sabatini 2024-04-06 7:41 ` [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux Stefano Sabatini 1 sibling, 1 reply; 4+ messages in thread From: Antoine Soulier via ffmpeg-devel @ 2024-04-04 22:57 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Antoine Soulier From: Antoine SOULIER <asoulier@google.com> 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 | 160 +++++++++++++++++++++++++++++++++++++++ libavformat/lc3enc.c | 100 ++++++++++++++++++++++++ 6 files changed, 271 insertions(+) create mode 100644 libavformat/lc3dec.c create mode 100644 libavformat/lc3enc.c diff --git a/Changelog b/Changelog index 18e83b99a1..92670f6a05 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 <next>: +- LC3/LC3plus demuxer and muxer - Raw Captions with Time (RCWT) closed caption demuxer - LC3/LC3plus decoding/encoding using external library liblc3 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..1fcde8ca4e --- /dev/null +++ b/libavformat/lc3dec.c @@ -0,0 +1,160 @@ +/* + * LC3 demuxer + * Copyright (C) 2024 Antoine Soulier <asoulier@google.com> + * + * 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) +{ + uint16_t frame_10us, srate_100hz; + + 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_100hz = AV_RL16(p->buf + 4); + if (srate_100hz != 8000/100 && srate_100hz != 16000/100 && + srate_100hz != 24000/100 && srate_100hz != 32000/100 && + srate_100hz != 48000/100 && srate_100hz != 96000/100) + return 0; + + frame_10us = AV_RL16(p->buf + 10); + if (frame_10us != 2500/10 && frame_10us != 5000/10 && + frame_10us != 7500/10 && frame_10us != 10000/10) + 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; + uint16_t frame_10us; + uint32_t length; + int ep_mode, hr_mode; + int srate_hz, channels, bit_rate; + int num_extra_params, ret; + int delay; + + 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); + 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_10us); + AV_WL16(st->codecpar->extradata + 2, ep_mode); + AV_WL16(st->codecpar->extradata + 4, hr_mode); + + lc3->frame_samples = av_rescale(frame_10us, srate_hz, 100*1000); + + delay = av_rescale(frame_10us == 750 ? 400 : 250, srate_hz, 100*1000); + lc3->end_dts = length + delay; + + 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 = 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..e768212f63 --- /dev/null +++ b/libavformat/lc3enc.c @@ -0,0 +1,100 @@ +/* + * LC3 muxer + * Copyright (C) 2024 Antoine Soulier <asoulier@google.com> + * + * 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, +}; -- 2.44.0.478.gd926399ef9-goog _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport 2024-04-04 22:57 ` [FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport Antoine Soulier via ffmpeg-devel @ 2024-04-06 7:54 ` Stefano Sabatini 0 siblings, 0 replies; 4+ messages in thread From: Stefano Sabatini @ 2024-04-06 7:54 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Antoine Soulier On date Thursday 2024-04-04 22:57:34 +0000, ffmpeg-devel Mailing List wrote: > From: Antoine SOULIER <asoulier@google.com> > > 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 | 160 +++++++++++++++++++++++++++++++++++++++ > libavformat/lc3enc.c | 100 ++++++++++++++++++++++++ > 6 files changed, 271 insertions(+) > create mode 100644 libavformat/lc3dec.c > create mode 100644 libavformat/lc3enc.c > > diff --git a/Changelog b/Changelog > index 18e83b99a1..92670f6a05 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 <next>: > +- LC3/LC3plus demuxer and muxer > - Raw Captions with Time (RCWT) closed caption demuxer > - LC3/LC3plus decoding/encoding using external library liblc3 nit: add new entry to the bottom > > 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..1fcde8ca4e > --- /dev/null > +++ b/libavformat/lc3dec.c > @@ -0,0 +1,160 @@ > +/* > + * LC3 demuxer > + * Copyright (C) 2024 Antoine Soulier <asoulier@google.com> > + * > + * 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) > +{ > + uint16_t frame_10us, srate_100hz; > + > + 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_100hz = AV_RL16(p->buf + 4); > + if (srate_100hz != 8000/100 && srate_100hz != 16000/100 && > + srate_100hz != 24000/100 && srate_100hz != 32000/100 && > + srate_100hz != 48000/100 && srate_100hz != 96000/100) > + return 0; nit++: sligthly simpler if you multiply srate to avoid the dividend in the checks Also I'm a bit surprised by this logic, since here we are assuming only a subset of srate values, but on the other end there is no validation in the demuxer. Probably it's good to keep this logic for the probing, but in this case we should also add validation here and in the muxer? > + > + frame_10us = AV_RL16(p->buf + 10); > + if (frame_10us != 2500/10 && frame_10us != 5000/10 && > + frame_10us != 7500/10 && frame_10us != 10000/10) > + return 0; ditto mutatis mutandis [...] _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux 2024-04-04 22:57 [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux Antoine Soulier via ffmpeg-devel 2024-04-04 22:57 ` [FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport Antoine Soulier via ffmpeg-devel @ 2024-04-06 7:41 ` Stefano Sabatini 1 sibling, 0 replies; 4+ messages in thread From: Stefano Sabatini @ 2024-04-06 7:41 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Antoine Soulier On date Thursday 2024-04-04 22:57:33 +0000, ffmpeg-devel Mailing List wrote: > From: Antoine SOULIER <asoulier@google.com> > > Use the packet duration field to invalid last samples of the last frame. > --- > libavcodec/liblc3dec.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) Will apply this soon, thanks. _______________________________________________ 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". ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-06 7:54 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-04-04 22:57 [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux Antoine Soulier via ffmpeg-devel 2024-04-04 22:57 ` [FFmpeg-devel] [PATCH 2/2] avformat/lc3: Add file format for LC3/LC3plus transport Antoine Soulier via ffmpeg-devel 2024-04-06 7:54 ` Stefano Sabatini 2024-04-06 7:41 ` [FFmpeg-devel] [PATCH 1/2] avcodec/liblc3dec: Retrieve duration of the last packet from the demux Stefano Sabatini
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git