RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

iir: change filter type if/else to a switch. 

Simplifies error handling and makes it easier to add additional filter types.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Justin Ruggles 2011-01-20 21:59:23 +00:00 committed by Mans Rullgard
parent fcdf0a43cd
commit 0361d13cf3
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/iirfilter.c
View File

@ -164,6 +164,7 @@ av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc,
float stopband, float ripple)
{
FFIIRFilterCoeffs *c;
int ret = 0;
if (order <= 0 || order > MAXORDER || cutoff_ratio >= 1.0)
return NULL;
@ -176,22 +177,22 @@ av_cold struct FFIIRFilterCoeffs* ff_iir_filter_init_coeffs(void *avc,
init_fail);
c->order = order;
if (filt_type == FF_FILTER_TYPE_BUTTERWORTH) {
if (butterworth_init_coeffs(avc, c, filt_mode, order, cutoff_ratio,
stopband)) {
goto init_fail;
}
} else if (filt_type == FF_FILTER_TYPE_BIQUAD) {
if (biquad_init_coeffs(avc, c, filt_mode, order, cutoff_ratio,
stopband)) {
goto init_fail;
}
} else {
switch (filt_type) {
case FF_FILTER_TYPE_BUTTERWORTH:
ret = butterworth_init_coeffs(avc, c, filt_mode, order, cutoff_ratio,
stopband);
break;
case FF_FILTER_TYPE_BIQUAD:
ret = biquad_init_coeffs(avc, c, filt_mode, order, cutoff_ratio,
stopband);
break;
default:
av_log(avc, AV_LOG_ERROR, "filter type is not currently implemented\n");
goto init_fail;
}
return c;
if (!ret)
return c;
init_fail:
ff_iir_filter_free_coeffs(c);