diff mbox series

[FFmpeg-devel] A-pac demuxer and decoder

Message ID CAPYw7P6arVSmzk61pJ9U0NNQjCvbz_O64ZCfs_W82BHvDRdDUA@mail.gmail.com
State New
Headers show
Series [FFmpeg-devel] A-pac demuxer and decoder | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/make_x86 fail Make failed

Commit Message

Paul B Mahol Sept. 21, 2022, 7:23 a.m. UTC 
Patches attached.

Comments

Paul B Mahol Sept. 23, 2022, 5:48 p.m. UTC | #1 
On 9/21/22, Paul B Mahol <onemda@gmail.com> wrote:
> Patches attached.
>

WIll apply soon.
James Almer Sept. 23, 2022, 6:31 p.m. UTC | #2 
On 9/21/2022 4:23 AM, Paul B Mahol wrote:
> Patches attached.

[...]

> +static av_cold int apac_close(AVCodecContext *avctx)
> +{
> +    APACContext *s = avctx->priv_data;
> +
> +    av_freep(&s->bitstream);
> +    s->bitstream_size = 0;
> +
> +    for (int ch = 0; ch < avctx->ch_layout.nb_channels; ch++) {

for (int ch = 0; ch < FF_ARRAY_ELEMS(s->ch); ch++)

As Andreas mentioned on IRC, this will crash if you try to initialize 
the decoder by setting more than 2 channels otherwise.

> +        ChContext *c = &s->ch[ch];
> +
> +        av_audio_fifo_free(c->samples);
> +    }
> +
> +    return 0;
> +}
diff mbox series

Patch

From d2d7ed7a0539424fe3dd72fdc68a95840d54123b Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon, 19 Sep 2022 22:05:20 +0200
Subject: [PATCH 2/2] avformat: add APAC demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavformat/Makefile     |  1 +
 libavformat/allformats.c |  1 +
 libavformat/apac.c       | 85 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 libavformat/apac.c

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 19deb33c2e..d669dc8f44 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -101,6 +101,7 @@  OBJS-$(CONFIG_AMRNB_DEMUXER)             += amr.o rawdec.o
 OBJS-$(CONFIG_AMRWB_DEMUXER)             += amr.o rawdec.o
 OBJS-$(CONFIG_AMV_MUXER)                 += amvenc.o
 OBJS-$(CONFIG_ANM_DEMUXER)               += anm.o
+OBJS-$(CONFIG_APAC_DEMUXER)              += apac.o rawdec.o
 OBJS-$(CONFIG_APC_DEMUXER)               += apc.o
 OBJS-$(CONFIG_APE_DEMUXER)               += ape.o apetag.o img2.o
 OBJS-$(CONFIG_APM_DEMUXER)               += apm.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index a545b5ff45..47c419a009 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -52,6 +52,7 @@  extern const AVInputFormat  ff_amrnb_demuxer;
 extern const AVInputFormat  ff_amrwb_demuxer;
 extern const AVOutputFormat ff_amv_muxer;
 extern const AVInputFormat  ff_anm_demuxer;
+extern const AVInputFormat  ff_apac_demuxer;
 extern const AVInputFormat  ff_apc_demuxer;
 extern const AVInputFormat  ff_ape_demuxer;
 extern const AVInputFormat  ff_apm_demuxer;
diff --git a/libavformat/apac.c b/libavformat/apac.c
new file mode 100644
index 0000000000..4d484221fe
--- /dev/null
+++ b/libavformat/apac.c
@@ -0,0 +1,85 @@ 
+/*
+ * APAC demuxer
+ * Copyright (c) 2022 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 "avformat.h"
+#include "demux.h"
+#include "internal.h"
+#include "rawdec.h"
+
+static int apac_probe(const AVProbeData *p)
+{
+    if (AV_RB32(p->buf) == MKBETAG('A','P','A','C') &&
+        AV_RB32(p->buf + 8) == MKBETAG('P','R','O','F') &&
+        AV_RB32(p->buf + 12) == MKBETAG('N','A','D',' '))
+        return AVPROBE_SCORE_MAX;
+
+    return 0;
+}
+
+static int apac_read_header(AVFormatContext *s)
+{
+    AVIOContext *pb = s->pb;
+    uint32_t chunk_size;
+    AVStream *st;
+    int64_t pos;
+
+    avio_skip(pb, 16);
+    chunk_size = avio_rl32(pb);
+    avio_skip(pb, chunk_size);
+    if (avio_rb32(pb) != MKBETAG('P','F','M','T'))
+        return AVERROR_INVALIDDATA;
+    chunk_size = avio_rl32(pb);
+    pos = avio_tell(pb);
+    avio_skip(pb, 2);
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+    st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_id    = AV_CODEC_ID_APAC;
+    st->codecpar->ch_layout.nb_channels = avio_rl16(pb);
+    st->codecpar->sample_rate = avio_rl32(pb);
+    if (st->codecpar->ch_layout.nb_channels <= 0 ||
+        st->codecpar->sample_rate <= 0)
+        return AVERROR_INVALIDDATA;
+    avio_skip(pb, 2);
+    st->codecpar->bits_per_coded_sample = avio_rl16(pb);
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
+    avio_skip(pb, (chunk_size + pos) - avio_tell(pb) + (chunk_size & 1));
+    if (avio_rb32(pb) != MKBETAG('P','A','D',' '))
+        return AVERROR_INVALIDDATA;
+    avio_skip(pb, 4);
+
+    return 0;
+}
+
+const AVInputFormat ff_apac_demuxer = {
+    .name           = "apac",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw APAC"),
+    .read_probe     = apac_probe,
+    .read_header    = apac_read_header,
+    .read_packet    = ff_raw_read_partial_packet,
+    .extensions     = "apc",
+    .flags          = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS,
+    .raw_codec_id   = AV_CODEC_ID_APAC,
+    .priv_data_size = sizeof(FFRawDemuxerContext),
+    .priv_class     = &ff_raw_demuxer_class,
+};
-- 
2.37.2