Mercurial > libavcodec.hg

changeset 6672:79984fdb1203 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow bitrates zero and 13200 (needed for decoding mov and aiff)
author mbardiaux
date Fri, 25 Apr 2008 13:05:15 +0000
parents 2d0b86dfe5bb
children 679b9ef6f5f3
files libgsm.c
diffstat 1 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgsm.c	Thu Apr 24 22:27:13 2008 +0000
+++ b/libgsm.c	Fri Apr 25 13:05:15 2008 +0000
@@ -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();