diff options
| author | Andy Hung <hunga@google.com> | 2014-02-04 00:30:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-04 00:30:55 +0000 |
| commit | a98a58ce32f4ad1bdb7692184eb17622fb11e397 (patch) | |
| tree | 96c5f123e9963a491d4883faa064dae231bc5f9c /services | |
| parent | b42398bb30e47313f42f91292657a9b8cc752511 (diff) | |
| parent | 83be2560d9396b3bd32919123bd67a783e6aaf7c (diff) | |
| download | frameworks_av-a98a58ce32f4ad1bdb7692184eb17622fb11e397.zip frameworks_av-a98a58ce32f4ad1bdb7692184eb17622fb11e397.tar.gz frameworks_av-a98a58ce32f4ad1bdb7692184eb17622fb11e397.tar.bz2 | |
Merge "Fix dynamic resampling for non-NEON devices"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioResamplerDyn.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/services/audioflinger/AudioResamplerDyn.cpp b/services/audioflinger/AudioResamplerDyn.cpp index 984548d..cd67df5 100644 --- a/services/audioflinger/AudioResamplerDyn.cpp +++ b/services/audioflinger/AudioResamplerDyn.cpp @@ -372,11 +372,7 @@ void AudioResamplerDyn::setSampleRate(int32_t inSampleRate) { if (locked) { mPhaseFraction = mPhaseFraction >> c.mShift << c.mShift; // remove fractional phase } - if (!USE_NEON) { - stride = 2; // C version only - } - // TODO: Remove this for testing - //stride = 2; + mResampleType = RESAMPLETYPE(mChannelCount, locked, stride, !!useS32); #ifdef DEBUG_RESAMPLER printf("channels:%d %s stride:%d %s coef:%d shift:%d\n", @@ -392,7 +388,7 @@ void AudioResamplerDyn::resample(int32_t* out, size_t outFrameCount, // 24 cases - this perhaps can be reduced later, as testing might take too long switch (mResampleType) { - // stride 16 (stride 2 for machines that do not support NEON) + // stride 16 (falls back to stride 2 for machines that do not support NEON) case RESAMPLETYPE(1, true, 16, 0): return resample<1, true, 16>(out, outFrameCount, mConstants.mFirCoefsS16, provider); case RESAMPLETYPE(2, true, 16, 0): |