[FFmpeg-devel] QOA decoding support

Message ID	CAPYw7P7HjG6Ow+Uv4JJgyhyKiqSsTqBLOePwU9hOw5pF61peiw@mail.gmail.com
State	New
Headers	show Delivered-To: ffmpegpatchwork2@gmail.com 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; MIME-Version: 1.0 From: Paul B Mahol <onemda@gmail.com> Date: Sat, 23 Sep 2023 23:39:45 +0200 Message-ID: <CAPYw7P7HjG6Ow+Uv4JJgyhyKiqSsTqBLOePwU9hOw5pF61peiw@mail.gmail.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: multipart/mixed; boundary="000000000000354ca206060d91c5" Subject: [FFmpeg-devel] [PATCH] QOA decoding support Precedence: list Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Series	[FFmpeg-devel] QOA decoding support \| expand [FFmpeg-devel] QOA decoding support

Context	Check	Description
andriy/make_x86	fail	Make failed

From 1bf5a9170745cdcf25df9e144fd31bb172afdbd1 Mon Sep 17 00:00:00 2001 From: Paul B Mahol <onemda@gmail.com> Date: Sat, 23 Sep 2023 16:38:35 +0200 Subject: [PATCH 1/2] avformat: add QOA demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com> --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/qoadec.c | 83 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 libavformat/qoadec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 329055ccfd..2db83aff81 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -484,6 +484,7 @@ OBJS-$(CONFIG_PP_BNK_DEMUXER) += pp_bnk.o OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_PVF_DEMUXER) += pvfdec.o pcm.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o +OBJS-$(CONFIG_QOA_DEMUXER) += qoadec.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += rawenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d4b505a5a3..c8bb4e3866 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -383,6 +383,7 @@ extern const FFOutputFormat ff_psp_muxer; extern const AVInputFormat ff_pva_demuxer; extern const AVInputFormat ff_pvf_demuxer; extern const AVInputFormat ff_qcp_demuxer; +extern const AVInputFormat ff_qoa_demuxer; extern const AVInputFormat ff_r3d_demuxer; extern const AVInputFormat ff_rawvideo_demuxer; extern const FFOutputFormat ff_rawvideo_muxer; diff --git a/libavformat/qoadec.c b/libavformat/qoadec.c new file mode 100644 index 0000000000..228e08cee8 --- /dev/null +++ b/libavformat/qoadec.c @@ -0,0 +1,83 @@ +/* + * QOA demuxer + * + * 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 "avformat.h" +#include "avio_internal.h" +#include "internal.h" +#include "rawdec.h" +#include "libavutil/intreadwrite.h" + +static int qoa_probe(const AVProbeData *p) +{ + if ((p->buf_size < 16) || + (AV_RB32(p->buf) != MKBETAG('q','o','a','f')) || + (AV_RB32(p->buf + 4) == 0) || + (p->buf[8] == 0) || + (AV_RB24(p->buf + 9) == 0) || + (AV_RB16(p->buf + 12) == 0) || + (AV_RB16(p->buf + 14) == 0)) + return 0; + return AVPROBE_SCORE_MAX; +} + +static int qoa_read_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVStream *st; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avio_skip(pb, 4); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_QOA; + ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; + st->duration = avio_rb32(pb); + st->start_time = 0; + + ffio_ensure_seekback(pb, 4); + st->codecpar->ch_layout.nb_channels = avio_r8(pb); + if (st->codecpar->ch_layout.nb_channels == 0) + return AVERROR_INVALIDDATA; + + st->codecpar->sample_rate = avio_rb24(pb); + if (st->codecpar->sample_rate == 0) + return AVERROR_INVALIDDATA; + + avio_seek(pb, -4, SEEK_CUR); + + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + + return 0; +} + +const AVInputFormat ff_qoa_demuxer = { + .name = "qoa", + .long_name = NULL_IF_CONFIG_SMALL("raw QOA"), + .read_probe = qoa_probe, + .read_header = qoa_read_header, + .read_packet = ff_raw_read_partial_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "qoa", + .raw_codec_id = AV_CODEC_ID_QOA, + .priv_data_size = sizeof(FFRawDemuxerContext), + .priv_class = &ff_raw_demuxer_class, +}; -- 2.42.0

[FFmpeg-devel] QOA decoding support

Checks

Commit Message

Comments

Patch