highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

g726: treat sample rates other than 8kHz as unofficial.

Browse Source
This commit is contained in:
Justin Ruggles
2011-10-27 20:45:24 -04:00
parent 6e8d4a7afb
commit 9e78d8cfdf
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/g726.c
View File

@@ -302,6 +302,13 @@ static av_cold int g726_encode_init(AVCodecContext *avctx)
{ {
G726Context* c = avctx->priv_data; G726Context* c = avctx->priv_data;
if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL &&
avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Sample rates other than 8kHz are not "
"allowed when the compliance level is higher than unofficial. "
"Resample or reduce the compliance level.\n");
return AVERROR(EINVAL);
}
if (avctx->sample_rate <= 0) { if (avctx->sample_rate <= 0) {
av_log(avctx, AV_LOG_ERROR, "Samplerate is invalid\n"); av_log(avctx, AV_LOG_ERROR, "Samplerate is invalid\n");
return -1; return -1;
@@ -366,6 +373,14 @@ static av_cold int g726_decode_init(AVCodecContext *avctx)
{ {
G726Context* c = avctx->priv_data; G726Context* c = avctx->priv_data;
if (avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT &&
avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Only 8kHz sample rate is allowed when "
"the compliance level is strict. Reduce the compliance level "
"if you wish to decode the stream anyway.\n");
return AVERROR(EINVAL);
}
if(avctx->channels != 1){ if(avctx->channels != 1){
av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n"); av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n");
return -1; return -1;