[FFmpeg-cvslog] r18798 - in trunk/libavcodec: nellymoserdec.c nellymoserenc.c

[diego]

Author: diego
Date: Mon May 11 21:21:49 2009
New Revision: 18798

Log:
Support 16K samplerate in Nellymoser.
patch by Alexander Chemeris, ipse.ffmpeg gmail.com

Modified:
   trunk/libavcodec/nellymoserdec.c
   trunk/libavcodec/nellymoserenc.c

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	Mon May 11 10:45:20 2009	(r18797)
+++ trunk/libavcodec/nellymoserdec.c	Mon May 11 21:21:49 2009	(r18798)
@@ -170,6 +170,8 @@ static int decode_tag(AVCodecContext * a
             blocks = 1; break;
         case 128:   // 11025Hz
             blocks = 2; break;
+        case 192:   // 16000Hz
+            blocks = 3; break;
         case 256:   // 22050Hz
             blocks = 4; break;
         case 512:   // 44100Hz

Modified: trunk/libavcodec/nellymoserenc.c
==============================================================================
--- trunk/libavcodec/nellymoserenc.c	Mon May 11 10:45:20 2009	(r18797)
+++ trunk/libavcodec/nellymoserenc.c	Mon May 11 21:21:49 2009	(r18798)
@@ -135,10 +135,11 @@ static av_cold int encode_init(AVCodecCo
         return -1;
     }
 
-    if (avctx->sample_rate != 8000 && avctx->sample_rate != 11025 &&
+    if (avctx->sample_rate != 8000 && avctx->sample_rate != 16000 &&
+        avctx->sample_rate != 11025 &&
         avctx->sample_rate != 22050 && avctx->sample_rate != 44100 &&
         avctx->strict_std_compliance >= FF_COMPLIANCE_NORMAL) {
-        av_log(avctx, AV_LOG_ERROR, "Nellymoser works only with 8000, 11025, 22050 and 44100 sample rate\n");
+        av_log(avctx, AV_LOG_ERROR, "Nellymoser works only with 8000, 16000, 11025, 22050 and 44100 sample rate\n");
         return -1;
     }