Commit 1d0d6305 authored by Reimar Döffinger's avatar Reimar Döffinger

sipr: fall back to setting mode based on bit_rate.

Not all applications (e.g. MPlayer) set block_align, and
when using a different demuxer it might not even be
easily available.
So fall back to selecting mode based on bit rate as before
if block_align has not useful value.
It can't be worse than failing to decode completely.
Signed-off-by: 's avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
parent 96fc1f07
...@@ -487,7 +487,10 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx) ...@@ -487,7 +487,10 @@ static av_cold int sipr_decoder_init(AVCodecContext * avctx)
case 37: ctx->mode = MODE_5k0; break; case 37: ctx->mode = MODE_5k0; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Invalid block_align: %d\n", avctx->block_align); av_log(avctx, AV_LOG_ERROR, "Invalid block_align: %d\n", avctx->block_align);
return AVERROR(EINVAL); if (avctx->bit_rate > 12200) ctx->mode = MODE_16k;
else if (avctx->bit_rate > 7500 ) ctx->mode = MODE_8k5;
else if (avctx->bit_rate > 5750 ) ctx->mode = MODE_6k5;
else ctx->mode = MODE_5k0;
} }
av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name); av_log(avctx, AV_LOG_DEBUG, "Mode: %s\n", modes[ctx->mode].mode_name);
......
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