From d9d7b4cc41969aea393180f55687ce83ae36632a Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 11 May 2009 19:21:49 +0000 Subject: [PATCH] Support 16K samplerate in Nellymoser. patch by Alexander Chemeris, ipse.ffmpeg gmail.com git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18798 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavcodec/nellymoserdec.c | 2 ++ libavcodec/nellymoserenc.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index cf4a91626..94f441890 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -170,6 +170,8 @@ static int decode_tag(AVCodecContext * avctx, blocks = 1; break; case 128: // 11025Hz blocks = 2; break; + case 192: // 16000Hz + blocks = 3; break; case 256: // 22050Hz blocks = 4; break; case 512: // 44100Hz diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 1cf0f14e1..1bb6c666a 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -135,10 +135,11 @@ static av_cold int encode_init(AVCodecContext *avctx) 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; } -- 2.39.2