[FFmpeg-cvslog] avformat: add OSQ demuxer
Paul B Mahol
git at videolan.org
Fri Sep 1 15:21:45 EEST 2023
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Jun 27 19:51:54 2023 +0200| [fba454617555524900c99a4a236fb3a3266d081d] | committer: Paul B Mahol
avformat: add OSQ demuxer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fba454617555524900c99a4a236fb3a3266d081d
---
Changelog | 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/osq.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++
libavformat/version.h | 4 +-
5 files changed, 123 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index c010e86159..6c2622dc4e 100644
--- a/Changelog
+++ b/Changelog
@@ -30,6 +30,7 @@ version <next>:
- support for the P_SKIP hinting to speed up libx264 encoding
- Support HEVC,VP9,AV1 codec in enhanced flv format
- apsnr and asisdr audio filters
+- OSQ demuxer and decoder
version 6.0:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index f9944baab9..cc1b12360a 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -433,6 +433,7 @@ OBJS-$(CONFIG_OMA_DEMUXER) += omadec.o pcm.o oma.o
OBJS-$(CONFIG_OMA_MUXER) += omaenc.o rawenc.o oma.o id3v2enc.o
OBJS-$(CONFIG_OPUS_MUXER) += oggenc.o \
vorbiscomment.o
+OBJS-$(CONFIG_OSQ_DEMUXER) += osq.o rawdec.o
OBJS-$(CONFIG_PAF_DEMUXER) += paf.o
OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += pcmdec.o pcm.o
OBJS-$(CONFIG_PCM_ALAW_MUXER) += pcmenc.o rawenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6324952bd2..f4210e4932 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -331,6 +331,7 @@ extern const FFOutputFormat ff_ogv_muxer;
extern const AVInputFormat ff_oma_demuxer;
extern const FFOutputFormat ff_oma_muxer;
extern const FFOutputFormat ff_opus_muxer;
+extern const AVInputFormat ff_osq_demuxer;
extern const AVInputFormat ff_paf_demuxer;
extern const AVInputFormat ff_pcm_alaw_demuxer;
extern const FFOutputFormat ff_pcm_alaw_muxer;
diff --git a/libavformat/osq.c b/libavformat/osq.c
new file mode 100644
index 0000000000..c5a63d3398
--- /dev/null
+++ b/libavformat/osq.c
@@ -0,0 +1,118 @@
+/*
+ * OSQ demuxer
+ * Copyright (c) 2023 Paul B Mahol
+ *
+ * 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
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avio_internal.h"
+#include "avformat.h"
+#include "demux.h"
+#include "internal.h"
+#include "rawdec.h"
+
+static int osq_probe(const AVProbeData *p)
+{
+ if (AV_RL32(p->buf) != MKTAG('O','S','Q',' '))
+ return 0;
+ if (AV_RL32(p->buf + 4) != 48)
+ return 0;
+ if (AV_RL16(p->buf + 8) != 1)
+ return 0;
+ if (p->buf[10] == 0)
+ return 0;
+ if (p->buf[11] == 0)
+ return 0;
+ if (AV_RL32(p->buf + 12) == 0)
+ return 0;
+ if (AV_RL16(p->buf + 16) == 0)
+ return 0;
+
+ return AVPROBE_SCORE_MAX;
+}
+
+static int osq_read_header(AVFormatContext *s)
+{
+ uint32_t t, size;
+ AVStream *st;
+ int ret;
+
+ t = avio_rl32(s->pb);
+ if (t != MKTAG('O','S','Q',' '))
+ return AVERROR_INVALIDDATA;
+
+ size = avio_rl32(s->pb);
+ if (size != 48)
+ return AVERROR_INVALIDDATA;
+
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+ if ((ret = ff_get_extradata(s, st->codecpar, s->pb, size)) < 0)
+ return ret;
+
+ t = avio_rl32(s->pb);
+ if (t != MKTAG('R','I','F','F'))
+ return AVERROR_INVALIDDATA;
+ avio_skip(s->pb, 8);
+
+ t = avio_rl32(s->pb);
+ if (t != MKTAG('f','m','t',' '))
+ return AVERROR_INVALIDDATA;
+ size = avio_rl32(s->pb);
+ avio_skip(s->pb, size);
+
+ t = avio_rl32(s->pb);
+ size = avio_rl32(s->pb);
+ while (t != MKTAG('d','a','t','a')) {
+ avio_skip(s->pb, size);
+
+ t = avio_rl32(s->pb);
+ size = avio_rl32(s->pb);
+ if (avio_feof(s->pb))
+ return AVERROR_INVALIDDATA;
+ }
+
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_OSQ;
+ st->codecpar->sample_rate = AV_RL32(st->codecpar->extradata + 4);
+ if (st->codecpar->sample_rate <= 0)
+ return AVERROR_INVALIDDATA;
+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+ st->codecpar->ch_layout.nb_channels = st->codecpar->extradata[3];
+ if (st->codecpar->ch_layout.nb_channels == 0)
+ return AVERROR_INVALIDDATA;
+ st->start_time = 0;
+ st->duration = AV_RL32(st->codecpar->extradata + 16);
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+
+ return 0;
+}
+
+const AVInputFormat ff_osq_demuxer = {
+ .name = "osq",
+ .long_name = NULL_IF_CONFIG_SMALL("raw OSQ"),
+ .read_probe = osq_probe,
+ .read_header = osq_read_header,
+ .read_packet = ff_raw_read_partial_packet,
+ .extensions = "osq",
+ .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS,
+ .raw_codec_id = AV_CODEC_ID_OSQ,
+ .priv_data_size = sizeof(FFRawDemuxerContext),
+ .priv_class = &ff_raw_demuxer_class,
+};
diff --git a/libavformat/version.h b/libavformat/version.h
index 787ee8c90b..1055753772 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,8 +31,8 @@
#include "version_major.h"
-#define LIBAVFORMAT_VERSION_MINOR 10
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MINOR 11
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list