From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avcodec/adpcm: adpcm_dtk is stereo only
Date: Mon, 12 Aug 2024 13:51:56 -0300
Message-ID: <20240812165156.2433-1-jamrial@gmail.com> (raw)
Fixes ticket #11133
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/adpcm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 8d358bc414..623d33fd02 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -276,6 +276,9 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx)
return AVERROR_PATCHWELCOME;
}
break;
+ case AV_CODEC_ID_ADPCM_DTK:
+ min_channels = 2;
+ break;
case AV_CODEC_ID_ADPCM_PSX:
max_channels = 8;
if (avctx->ch_layout.nb_channels <= 0 ||
@@ -1047,7 +1050,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb,
break;
case AV_CODEC_ID_ADPCM_DTK:
case AV_CODEC_ID_ADPCM_PSX:
- nb_samples = buf_size / (16 * ch) * 28;
+ nb_samples = buf_size / 32 * 28;
break;
case AV_CODEC_ID_ADPCM_ARGO:
nb_samples = buf_size / avctx->block_align * 32;
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2024-08-12 16:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 16:51 James Almer [this message]
2024-08-12 17:55 ` Andreas Rheinhardt
2024-08-12 17:58 ` James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240812165156.2433-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git