From 96ddaff5ec76f40d4ea6d00f07ff246388db4835 Mon Sep 17 00:00:00 2001 From: Michel Bardiaux Date: Fri, 25 Apr 2008 13:05:15 +0000 Subject: Allow bitrates zero and 13200 (needed for decoding mov and aiff) Originally committed as revision 12953 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/libgsm.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'libavcodec/libgsm.c') diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 3ae5567f72..82e00b1f51 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -36,8 +36,23 @@ #define GSM_FRAME_SIZE 160 static av_cold int libgsm_init(AVCodecContext *avctx) { - if (avctx->channels > 1 || avctx->sample_rate != 8000 || avctx->bit_rate != 13000) + if (avctx->channels > 1) { + av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n", + avctx->channels); return -1; + } + if (avctx->sample_rate != 8000) { + av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n", + avctx->sample_rate); + return -1; + } + if (avctx->bit_rate != 13000 /* Official */ && + avctx->bit_rate != 13200 /* Very common */ && + avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) { + av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n", + avctx->bit_rate); + return -1; + } avctx->priv_data = gsm_create(); -- cgit v1.2.3