Support 16K samplerate in Nellymoser.

patch by Alexander Chemeris, ipse.ffmpeg gmail.com

Originally committed as revision 18798 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Alexander Chemeris 16 years ago committed by Diego Biurrun
parent 325aef38da
commit c67d725589
  1. 2
      libavcodec/nellymoserdec.c
  2. 5
      libavcodec/nellymoserenc.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

@ -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;
}

Loading…
Cancel
Save