g726: treat sample rates other than 8kHz as unofficial.
authorJustin Ruggles <justin.ruggles@gmail.com>
Fri, 28 Oct 2011 00:45:24 +0000 (20:45 -0400)
committerJustin Ruggles <justin.ruggles@gmail.com>
Wed, 2 Nov 2011 01:23:03 +0000 (21:23 -0400)
libavcodec/g726.c

index b17d578..12a37e0 100644 (file)
@@ -302,6 +302,13 @@ static av_cold int g726_encode_init(AVCodecContext *avctx)
 {
     G726Context* c = avctx->priv_data;
 
+    if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL &&
+        avctx->sample_rate != 8000) {
+        av_log(avctx, AV_LOG_ERROR, "Sample rates other than 8kHz are not "
+               "allowed when the compliance level is higher than unofficial. "
+               "Resample or reduce the compliance level.\n");
+        return AVERROR(EINVAL);
+    }
     if (avctx->sample_rate <= 0) {
         av_log(avctx, AV_LOG_ERROR, "Samplerate is invalid\n");
         return -1;
@@ -366,6 +373,14 @@ static av_cold int g726_decode_init(AVCodecContext *avctx)
 {
     G726Context* c = avctx->priv_data;
 
+    if (avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT &&
+        avctx->sample_rate != 8000) {
+        av_log(avctx, AV_LOG_ERROR, "Only 8kHz sample rate is allowed when "
+               "the compliance level is strict. Reduce the compliance level "
+               "if you wish to decode the stream anyway.\n");
+        return AVERROR(EINVAL);
+    }
+
     if(avctx->channels != 1){
         av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");
         return -1;