Should reduce decoding overhead.
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavcodec/adpcm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 71e37efde7..e409a3aa6a 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1966,11 +1966,13 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
void *data,
}
break;
case AV_CODEC_ID_ADPCM_PSX:
+ for (int block = 0; block < avpkt->size / FFMAX(avctx->block_align, 16
* avctx->channels); block++) {
+ int nb_samples_per_block = 28 * FFMAX(avctx->block_align, 16 *
avctx->channels) / (16 * avctx->channels);
for (channel = 0; channel < avctx->channels; channel++) {
- samples = samples_p[channel];
+ samples = samples_p[channel] + block * nb_samples_per_block;
/* Read in every sample for this channel. */
- for (i = 0; i < nb_samples / 28; i++) {
+ for (i = 0; i < nb_samples_per_block / 28; i++) {
int filter, shift, flag, byte;
filter = bytestream2_get_byteu(&gb);
@@ -2001,6 +2003,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void
*data,
}
}
}
+ }
break;
case AV_CODEC_ID_ADPCM_ARGO:
/*
--
2.17.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".
