diff options
| author | Gregory Maxwell <greg@xiph.org> | 2011-09-28 02:26:45 -0400 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2011-09-28 02:26:45 -0400 |
| commit | 96739ad35e57706a69b9198b4862a5814f8e98bd (patch) | |
| tree | 6959a35a6ccd7c58906968369649449384b99a39 /silk/resampler_private_IIR_FIR.c | |
| parent | 5d48dbd3117cda1413b9677f28bc32127b78c7f5 (diff) | |
| download | opus-96739ad35e57706a69b9198b4862a5814f8e98bd.tar.gz | |
Eliminate function pointers from the resampler.
Diffstat (limited to 'silk/resampler_private_IIR_FIR.c')
| -rw-r--r-- | silk/resampler_private_IIR_FIR.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c index e6049f4e..b3df995d 100644 --- a/silk/resampler_private_IIR_FIR.c +++ b/silk/resampler_private_IIR_FIR.c @@ -76,7 +76,11 @@ void silk_resampler_private_IIR_FIR( if( S->input2x == 1 ) { /* Upsample 2x */ - S->up2_function( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_144 ], in, nSamplesIn ); + if (S->up2_hq) { + silk_resampler_private_up2_HQ( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_144 ], in, nSamplesIn ); + } else { + silk_resampler_up2( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_144 ], in, nSamplesIn ); + } } else { /* Fourth-order ARMA filter */ silk_resampler_private_ARMA4( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_144 ], in, S->Coefs, nSamplesIn ); |