Right now both the ATRAC1 decoder implementation, and the AEA demuxer don't
accept 4-track and 8-track ATRAC data. This patch fixes that problem.From c42e05855a018e28159bf29b49137bb33f5e45fd Mon Sep 17 00:00:00 2001
From: asivery
Date: Sat, 15 Jun 2024 07:47:40 +0200
Subject: [PATCH] avformat/aeadec, avcodec/atrac1: Fix 8 and 4-channel ATRAC1 support
Signed-off-by: asivery
---
libavcodec/atrac1.c | 12 ++--
libavformat/aeadec.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c
index cdcc7a669e..448bdfc7e9 100644
--- a/libavcodec/atrac1.c
+++ b/libavcodec/atrac1.c
@@ -49,7 +49,7 @@
#define AT1_SU_SAMPLES 512///< number of samples in a sound unit
#define AT1_FRAME_SIZE AT1_SU_SIZE * 2
#define AT1_SU_MAX_BITS AT1_SU_SIZE * 8
-#define AT1_MAX_CHANNELS 2
+#define AT1_MAX_CHANNELS 8
#define AT1_QMF_BANDS3
#define IDX_LOW_BAND 0
@@ -339,7 +339,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
AVFloatDSPContext *fdsp;
int channels = avctx->ch_layout.nb_channels;
float scale = -1.0 / (1 << 15);
-int ret;
+int ret, ch;
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
@@ -380,10 +380,10 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
q->bands[2] = q->high;
/* Prepare the mdct overlap buffers */
-q->SUs[0].spectrum[0] = q->SUs[0].spec1;
-q->SUs[0].spectrum[1] = q->SUs[0].spec2;
-q->SUs[1].spectrum[0] = q->SUs[1].spec1;
-q->SUs[1].spectrum[1] = q->SUs[1].spec2;
+for (ch = 0; ch < AT1_MAX_CHANNELS; ch++) {
+q->SUs[ch].spectrum[0] = q->SUs[ch].spec1;
+q->SUs[ch].spectrum[1] = q->SUs[ch].spec2;
+}
return 0;
}
diff --git a/libavformat/aeadec.c b/libavformat/aeadec.c
index be18e7b725..0a3d09a89d 100644
--- a/libavformat/aeadec.c
+++ b/libavformat/aeadec.c
@@ -84,7 +84,7 @@ static int aea_read_header(AVFormatContext *s)
st->codecpar->sample_rate= 44100;
st->codecpar->bit_rate = 146000 * channels;
-if (channels != 1 && channels != 2) {
+if (channels < 1 || channels > 8) {
av_log(s, AV_LOG_ERROR, "Channels %d not supported!\n", channels);
return AVERROR_INVALIDDATA;
}
--
2.34.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
