Fixes CRC for vlc.ape and APE_48K_24bit_2CH_02_01.ape
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/apedec.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index cc0d7e2749..d48d3a676d 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -1592,13 +1592,24 @@ static int ape_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
s->samples -= blockstodecode;
if (avctx->err_recognition & AV_EF_CRCCHECK &&
- s->fileversion >= 3900 && s->bps < 24) {
+ s->fileversion >= 3900) {
uint32_t crc = s->CRC_state;
const AVCRC *crc_tab = av_crc_get_table(AV_CRC_32_IEEE_LE);
+ int stride = s->bps == 24 ? 4 : (s->bps>>3);
+ int offset = s->bps == 24;
+ int bytes = s->bps >> 3;
+
for (i = 0; i < blockstodecode; i++) {
for (ch = 0; ch < s->channels; ch++) {
- uint8_t *smp = frame->data[ch] + (i*(s->bps >> 3));
- crc = av_crc(crc_tab, crc, smp, s->bps >> 3);
+#if HAVE_BIGENDIAN
+ uint8_t *smp_native = frame->data[ch] + i*stride;
+ uint8_t smp[4];
+ for(int j = 0; j<stride; j++)
+ smp[j] = smp_native[stride-j-1];
+#else
+ uint8_t *smp = frame->data[ch] + i*stride;
+#endif
+ crc = av_crc(crc_tab, crc, smp+offset, bytes);
}
}
--
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".
