Mercurial > libavcodec.hg

changeset 9627:b10d954527a2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support 16K samplerate in Nellymoser. patch by Alexander Chemeris, ipse.ffmpeg gmail.com
author diego
date Mon, 11 May 2009 19:21:49 +0000
parents bd3e11b60ccd
children 4b6766057548
files nellymoserdec.c nellymoserenc.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/nellymoserdec.c	Mon May 11 04:34:23 2009 +0000
+++ b/nellymoserdec.c	Mon May 11 19:21:49 2009 +0000
@@ -170,6 +170,8 @@
             blocks = 1; break;
         case 128:   // 11025Hz
             blocks = 2; break;
+        case 192:   // 16000Hz
+            blocks = 3; break;
         case 256:   // 22050Hz
             blocks = 4; break;
         case 512:   // 44100Hz
--- a/nellymoserenc.c	Mon May 11 04:34:23 2009 +0000
+++ b/nellymoserenc.c	Mon May 11 19:21:49 2009 +0000
@@ -135,10 +135,11 @@
         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;
     }