virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/alsdec: Fix decoding error with mono audio files

Browse Source 
highest_decoded_channel is modified to serve as meant.

Reported-by: Noboru Harada <noboru@ieee.org>

Regression since: a11aa5f3ed
Fixes: Sin48k16bit1ch.mp4
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-05-07 10:02:01 +09:00
parent ab04fedaaa
commit f7987ce966
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/alsdec.c
View File

@ -1632,7 +1632,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
AVCodecContext *avctx = ctx->avctx; AVCodecContext *avctx = ctx->avctx;
GetBitContext *gb = &ctx->gb; GetBitContext *gb = &ctx->gb;
unsigned int div_blocks[32]; ///< block sizes. unsigned int div_blocks[32]; ///< block sizes.
unsigned int c; int c;
unsigned int js_blocks[2]; unsigned int js_blocks[2];
uint32_t bs_info = 0; uint32_t bs_info = 0;
int ret; int ret;
@ -1810,14 +1810,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
else else
ctx->cur_frame_length = sconf->frame_length; ctx->cur_frame_length = sconf->frame_length;
ctx->highest_decoded_channel = 0; ctx->highest_decoded_channel = -1;
// decode the frame data // decode the frame data
if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0) if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0)
av_log(ctx->avctx, AV_LOG_WARNING, av_log(ctx->avctx, AV_LOG_WARNING,
"Reading frame data failed. Skipping RA unit.\n"); "Reading frame data failed. Skipping RA unit.\n");
if (ctx->highest_decoded_channel == 0) if (ctx->highest_decoded_channel == -1) {
av_log(ctx->avctx, AV_LOG_WARNING,
"No channel data decoded.\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
ctx->frame_id++; ctx->frame_id++;