From patchwork Sat Sep 23 21:39:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp406135pzh; Sat, 23 Sep 2023 14:40:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMcoQwL+8chLcsQpmddA7eB8V9ZxGzGu9gaCGcVoTiR1NET1g2evnXfGya/SNn0ZyZs7Dk X-Received: by 2002:ac2:4f05:0:b0:502:fe0a:af23 with SMTP id k5-20020ac24f05000000b00502fe0aaf23mr2909999lfr.56.1695505213318; Sat, 23 Sep 2023 14:40:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695505213; cv=none; d=google.com; s=arc-20160816; b=GVUrgjEyH8RIZP4Wfi8dJH2AjJwVb7tfYZfS2E0jXrALOJhvveJm6+AGpOzCgw8CQ8 75X4YsFm83cTDY6RTcm6XGpS5kEuCauc4ydy7VKWE4wCUSCy/TvFBaDZl7fjBH4W0gPX xV+aAnMnTVdhrcoypzFq9nmft/AVNVOZ8oYZ6i0IawLDUTPIKN6kGKDiI0a3VbQoloH8 bfQMfLthOChPSS43n3H/CzSXFLL23PF2KJ4XrQIqO83T2s0bvcB0etIUk+SgU3XG+Bxv UKBDJxqaHtZV+ZJForMuBRKFfj7Ea9k0tQkr8bdIPNFKvfPUMT06cD999BDCVCcRrmcz 9EVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=91rJ0TAEAibB6w3NO5otIDj4xTlluyysX7Ol3gZlNuE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=v4dNihbAqr34oXOxdgPJeymIGLAky/A0oZkvD8f7c28LRBaKA0Yhd8JlJR4NE/j+TD KYWMZEMogpjiSECif6LuhkZQt9DU8HeabinPQFN9QlQxOxiqOj12hMQJodL73qmJWuqs 9B8RPdyPYMf7GD2iDn+Jc2MYysFI1XNENq6k1pjNnH5pmuI392S2ocBBu1yiC1aKN7OJ ZUkclbb+7xwVxO3VbTkSw4J5Rac4ujuYpc02NC6tbfxUs6RVRyWvu+2UJjPYtJPqTlwJ eX2Y5FctKzFBhcI8otHUeGSUYIG+E5vcWXS8mYCzBjjr7OIPw+dLRJ4aaTEVu4mzCNlb 2CKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=llhMOxfm; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e5-20020a50ec85000000b005309f1fcb25si5469373edr.655.2023.09.23.14.40.12; Sat, 23 Sep 2023 14:40:13 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=llhMOxfm; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE21A68C975; Sun, 24 Sep 2023 00:40:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D33868C808 for ; Sun, 24 Sep 2023 00:40:02 +0300 (EEST) Received: by mail-vs1-f54.google.com with SMTP id ada2fe7eead31-452832dbb5dso1830746137.0 for ; Sat, 23 Sep 2023 14:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695505201; x=1696110001; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=PK/DgVmkcw/1eQR4ymdEKOk1/v/V9L5RoRHfCRW5NIk=; b=llhMOxfm7Ot4htq1pzq5fywx7usgsVh4YqKWA6v99ySPODfvK53d6Tx0/0+DxsvD0C Rd+m+9mQ97Ses+lzvMrEiuXmwFW8BPW97TVFOfagx5nDyKSXd7xCFbpUoJuPxeJd5XHl BSlYBf7pdZxmW2ZHS45XOyMEL5p9xMwnSmmp3A2Jkh0jkhWgSwri8Z18b6KRjqlMxkh+ k+cTn6Xc172j0WpclhTp4biQYBD1iQ6lQMjoxe6IfXbcMxEK1J//TuEKQP+YRO2cmRTh RtwC1C/lD9NSBKyyapjC4VlDua4jEtpR7gW19bPAyvMw8Yg+GVIacKhswOStRiFy9TLC IdJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695505201; x=1696110001; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PK/DgVmkcw/1eQR4ymdEKOk1/v/V9L5RoRHfCRW5NIk=; b=A8Oh0HCzoderelLg0LRzKlek/Xp4+bzlkuargzhI9tnoKqvYz2WDobyaIJeq59aLua f1+7ahS2bVnYUbwZFqSv+hKjtN/X8gHlPQXatXHUvSkbC2FX/Z4VZavb93RK7Ua48YpY a0c48c6/FApjWO8Uf1o1ePs6ucy7pYGCXJfPRthB5gdlTO7wLUdnc02hvxGGMO8wzeK2 SnlsgdSMHSx7YVbTy30ESsw3Dj2NChnJ35izi9k+fRjyZQMY325b6OV3K2682FwAWTdN v4rSroTbVXjOhA7+yhk6iIpzkJ8PQ86J0HnhzhfYidMeKJ8oZ/hKU4p69IUv/7skkkaX BG9A== X-Gm-Message-State: AOJu0YwPxQ0f3G0vB2NzRHP1EfhAzNxXS5K+JWX5QJJuuXDyNC07QKxZ /WHt2TloOHEPS8CBa9Jkmeli16dkwBR4+mKnLFBQNOYV2B4= X-Received: by 2002:a67:f818:0:b0:44d:476b:3bbd with SMTP id l24-20020a67f818000000b0044d476b3bbdmr2001891vso.0.1695505200787; Sat, 23 Sep 2023 14:40:00 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Sat, 23 Sep 2023 23:39:45 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] QOA decoding support 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nSTM6kBFhMt1 Patches attached. From 1bf5a9170745cdcf25df9e144fd31bb172afdbd1 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 23 Sep 2023 16:38:35 +0200 Subject: [PATCH 1/2] avformat: add QOA demuxer Signed-off-by: Paul B Mahol --- 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