diff options
| author | Gregory Maxwell <greg@xiph.org> | 2011-09-29 16:20:38 -0400 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2011-09-29 16:20:38 -0400 |
| commit | 8d6467c7ed09535845f7c84074e7ffc1f2a364c8 (patch) | |
| tree | b780b9aaa79323a36136323490501cd47ba90c01 /silk/resampler_private_IIR_FIR.c | |
| parent | ad29b2c26a9a74cff984073336b7a27dd84ccef6 (diff) | |
| download | opus-8d6467c7ed09535845f7c84074e7ffc1f2a364c8.tar.gz | |
More silk/ resampler cleanup.
Diffstat (limited to 'silk/resampler_private_IIR_FIR.c')
| -rw-r--r-- | silk/resampler_private_IIR_FIR.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/silk/resampler_private_IIR_FIR.c b/silk/resampler_private_IIR_FIR.c index 7450dc49..9c9ffcaa 100644 --- a/silk/resampler_private_IIR_FIR.c +++ b/silk/resampler_private_IIR_FIR.c @@ -74,13 +74,9 @@ void silk_resampler_private_IIR_FIR( while( 1 ) { nSamplesIn = silk_min( inLen, S->batchSize ); - if( S->input2x == 1 ) { - /* Upsample 2x */ - silk_resampler_private_up2_HQ( 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 ); - } + silk_assert( S->input2x ); + /* Upsample 2x */ + silk_resampler_private_up2_HQ( S->sIIR, &buf[ RESAMPLER_ORDER_FIR_144 ], in, nSamplesIn ); max_index_Q16 = silk_LSHIFT32( nSamplesIn, 16 + S->input2x ); /* +1 if 2x upsampling */ out = silk_resampler_private_IIR_FIR_INTERPOL(out, buf, max_index_Q16, index_increment_Q16); |