diff options
| author | Ricardo Garcia <rago@google.com> | 2015-04-30 18:39:16 -0700 |
|---|---|---|
| committer | Ricardo Garcia <rago@google.com> | 2015-06-22 16:08:40 -0700 |
| commit | 6c7f062d3149d6890daaee64828959ad6f61ea54 (patch) | |
| tree | dcab2e17178bf6d01ead75fad5df883961a6e195 /services/audioflinger/AudioMixer.cpp | |
| parent | fa907d4ee326c7bb9cbb4882ab7c0ec42bbceee3 (diff) | |
| download | frameworks_av-6c7f062d3149d6890daaee64828959ad6f61ea54.zip frameworks_av-6c7f062d3149d6890daaee64828959ad6f61ea54.tar.gz frameworks_av-6c7f062d3149d6890daaee64828959ad6f61ea54.tar.bz2 | |
Using centralized isAudioPlaybackRateValid to validate parameters
Centralized validation code
bug: 20701446
Change-Id: I9d9941c7639c05b2afe069ff4f858c693c910bfe
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 01efc53..8a9a837 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -733,13 +733,9 @@ void AudioMixer::setParameter(int name, int target, int param, void *value) case PLAYBACK_RATE: { const AudioPlaybackRate *playbackRate = reinterpret_cast<AudioPlaybackRate*>(value); - ALOG_ASSERT(AUDIO_TIMESTRETCH_SPEED_MIN <= playbackRate->mSpeed - && playbackRate->mSpeed <= AUDIO_TIMESTRETCH_SPEED_MAX, - "bad speed %f", playbackRate->mSpeed); - ALOG_ASSERT(AUDIO_TIMESTRETCH_PITCH_MIN <= playbackRate->mPitch - && playbackRate->mPitch <= AUDIO_TIMESTRETCH_PITCH_MAX, - "bad pitch %f", playbackRate->mPitch); - //TODO: use function from AudioResamplerPublic.h to test validity. + ALOGW_IF(!isAudioPlaybackRateValid(*playbackRate), + "bad parameters speed %f, pitch %f",playbackRate->mSpeed, + playbackRate->mPitch); if (track.setPlaybackRate(*playbackRate)) { ALOGV("setParameter(TIMESTRETCH, PLAYBACK_RATE, STRETCH_MODE, FALLBACK_MODE " "%f %f %d %d", |