Skip to content

F
ffmpeg.wasm-core
Commit 8e7a06aa authored by Rodger Combs's avatar Rodger Combs Committed by Michael Niedermayer
Browse files
Options

lavc/adpcm: THP: handle packets with sample counts not divisible by 14 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7e7256c3
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
libavcodec/adpcm.c
View file @ 8e7a06aa
...@@ -648,8 +648,14 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, ...@@ -648,8 +648,14 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb,
*coded_samples = (avctx->codec->id == AV_CODEC_ID_ADPCM_THP_LE) ? *coded_samples = (avctx->codec->id == AV_CODEC_ID_ADPCM_THP_LE) ?
bytestream2_get_le32(gb) : bytestream2_get_le32(gb) :
bytestream2_get_be32(gb); bytestream2_get_be32(gb);
*coded_samples -= *coded_samples % 14; buf_size -= 8 + 36 * ch;
nb_samples = (buf_size - (8 + 36 * ch)) / (8 * ch) * 14; buf_size /= ch;
nb_samples = buf_size / 8 * 14;
if (buf_size % 8 > 1) {
nb_samples += (buf_size % 8 - 1) * 2;
if (*coded_samples & 1)
nb_samples -= 1;
}
break; break;
case AV_CODEC_ID_ADPCM_AFC: case AV_CODEC_ID_ADPCM_AFC:
nb_samples = buf_size / (9 * ch) * 16; nb_samples = buf_size / (9 * ch) * 16;
...@@ -1458,7 +1464,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, ...@@ -1458,7 +1464,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
samples = samples_p[ch]; samples = samples_p[ch];
/* Read in every sample for this channel. */ /* Read in every sample for this channel. */
for (i = 0; i < nb_samples / 14; i++) { for (i = 0; i < (nb_samples + 13) / 14; i++) {
int byte = bytestream2_get_byteu(&gb); int byte = bytestream2_get_byteu(&gb);
int index = (byte >> 4) & 7; int index = (byte >> 4) & 7;
unsigned int exp = byte & 0x0F; unsigned int exp = byte & 0x0F;
...@@ -1466,7 +1472,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, ...@@ -1466,7 +1472,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
int factor2 = table[ch][index * 2 + 1]; int factor2 = table[ch][index * 2 + 1];
/* Decode 14 samples. */ /* Decode 14 samples. */
for (n = 0; n < 14; n++) { for (n = 0; n < 14 && (i * 14 + n < nb_samples); n++) {
int32_t sampledat; int32_t sampledat;
if (n & 1) { if (n & 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment