videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-08 18:37:20 +02:00
Code Releases Activity

Support 16K samplerate in Nellymoser.

Browse Source 
patch by Alexander Chemeris, ipse.ffmpeg gmail.com

Originally committed as revision 18798 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Chemeris 2009-05-11 19:21:49 +00:00 committed by Diego Biurrun
parent 325aef38da
commit c67d725589
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/nellymoserdec.c
View File

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

5
libavcodec/nellymoserenc.c
View File

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