diff mbox series

[FFmpeg-devel] avformat/aeadec, avcodec/atrac1: Fix 8 and 4-channel ATRAC1 support

Message ID Q6A6UXwY_GI3zsSB-GUBmJJ3lAc64qHjoOdPk9PnDbDPPVAIO9dnbELezglP360JknlWoVCY-9EizIj1eIxWhDCwfFEnKRB2FHOu_kyCTkg=@protonmail.com
State New
Headers show
Series [FFmpeg-devel] avformat/aeadec, avcodec/atrac1: Fix 8 and 4-channel ATRAC1 support | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

asivery June 15, 2024, 5:57 a.m. UTC
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.

Comments

Anton Khirnov June 26, 2024, 7:54 a.m. UTC | #1
Quoting asivery via ffmpeg-devel (2024-06-15 07:57:05)
> 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 <asivery@protonmail.com>
> 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 <asivery@protonmail.com>
> ---
>  libavcodec/atrac1.c  | 12 ++++++------
>  libavformat/aeadec.c |  2 +-
>  2 files changed, 7 insertions(+), 7 deletions(-)

Got any samples you can share? A test would be nice.
diff mbox series

Patch

From c42e05855a018e28159bf29b49137bb33f5e45fd Mon Sep 17 00:00:00 2001
From: asivery <asivery@protonmail.com>
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 <asivery@protonmail.com>
---
 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_BANDS    3
 #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