ffmpeg | branch: master | Zane van Iperen <z...@zanevaniperen.com> | Mon May 3 21:20:26 2021 +1000| [a845e6daa9aba4cbed024de8cbefccaa6c40f4bb] | committer: Zane van Iperen
avcodec/adpcm_psx: always fetch next byte irregardless of flag Even though all samples are meant to be zero (if flag == 0x07), doesn't mean that they aren't there. See No$PSX docs [1]. [1]: https://problemkaputt.de/psx-spx.htm#spuadpcmsamples Signed-off-by: Zane van Iperen <z...@zanevaniperen.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a845e6daa9aba4cbed024de8cbefccaa6c40f4bb --- libavcodec/adpcm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 8fe43b5720..09ea062027 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -2008,14 +2008,14 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, for (n = 0; n < 28; n++) { int sample = 0, scale; - if (flag < 0x07) { - if (n & 1) { - scale = sign_extend(byte >> 4, 4); - } else { - byte = bytestream2_get_byteu(&gb); - scale = sign_extend(byte, 4); - } + if (n & 1) { + scale = sign_extend(byte >> 4, 4); + } else { + byte = bytestream2_get_byteu(&gb); + scale = sign_extend(byte, 4); + } + if (flag < 0x07) { scale = scale * (1 << 12); sample = (int)((scale >> shift) + (c->status[channel].sample1 * xa_adpcm_table[filter][0] + c->status[channel].sample2 * xa_adpcm_table[filter][1]) / 64); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
