Skip to content

Commit

Permalink
avcodec/alsdec: Fix decoding error with mono audio files
Browse files Browse the repository at this point in the history
highest_decoded_channel is modified to serve as meant.

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

Regression since: a11aa5f
Fixes: Sin48k16bit1ch.mp4
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f7987ce)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  • Loading branch information
michaelni committed Jun 18, 2021
1 parent 5f0c088 commit 0dc1c85
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions libavcodec/alsdec.c
Expand Up @@ -1632,7 +1632,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
AVCodecContext *avctx = ctx->avctx;
GetBitContext *gb = &ctx->gb;
unsigned int div_blocks[32]; ///< block sizes.
unsigned int c;
int c;
unsigned int js_blocks[2];
uint32_t bs_info = 0;
int ret;
Expand Down Expand Up @@ -1810,14 +1810,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
else
ctx->cur_frame_length = sconf->frame_length;

ctx->highest_decoded_channel = 0;
ctx->highest_decoded_channel = -1;
// decode the frame data
if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0)
av_log(ctx->avctx, AV_LOG_WARNING,
"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;
}

ctx->frame_id++;

Expand Down

0 comments on commit 0dc1c85

Please sign in to comment.