diff options
| author | Ricardo Garcia <rago@google.com> | 2015-06-23 00:25:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 00:25:08 +0000 |
| commit | 55a2dcce3a409393dc51ab2eb433914331f2df51 (patch) | |
| tree | ce69e72bd8520a05807a88a64bb58d33b0dc7962 /include | |
| parent | 2b343b1b2dd9e4885ef2b7ec2f798215d714ab3a (diff) | |
| parent | 6c7f062d3149d6890daaee64828959ad6f61ea54 (diff) | |
| download | frameworks_av-55a2dcce3a409393dc51ab2eb433914331f2df51.zip frameworks_av-55a2dcce3a409393dc51ab2eb433914331f2df51.tar.gz frameworks_av-55a2dcce3a409393dc51ab2eb433914331f2df51.tar.bz2 | |
Merge "Using centralized isAudioPlaybackRateValid to validate parameters" into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioResamplerPublic.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/media/AudioResamplerPublic.h b/include/media/AudioResamplerPublic.h index 6cf2ca9..055f724 100644 --- a/include/media/AudioResamplerPublic.h +++ b/include/media/AudioResamplerPublic.h @@ -108,6 +108,23 @@ static inline bool isAudioPlaybackRateEqual(const AudioPlaybackRate &pr1, pr2.mFallbackMode == pr2.mFallbackMode; } +static inline bool isAudioPlaybackRateValid(const AudioPlaybackRate &playbackRate) { + if (playbackRate.mFallbackMode == AUDIO_TIMESTRETCH_FALLBACK_FAIL && + (playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_SPEECH || + playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_DEFAULT)) { + //test sonic specific constraints + return playbackRate.mSpeed >= TIMESTRETCH_SONIC_SPEED_MIN && + playbackRate.mSpeed <= TIMESTRETCH_SONIC_SPEED_MAX && + playbackRate.mPitch >= AUDIO_TIMESTRETCH_PITCH_MIN && + playbackRate.mPitch <= AUDIO_TIMESTRETCH_PITCH_MAX; + } else { + return playbackRate.mSpeed >= AUDIO_TIMESTRETCH_SPEED_MIN && + playbackRate.mSpeed <= AUDIO_TIMESTRETCH_SPEED_MAX && + playbackRate.mPitch >= AUDIO_TIMESTRETCH_PITCH_MIN && + playbackRate.mPitch <= AUDIO_TIMESTRETCH_PITCH_MAX; + } +} + // TODO: Consider putting these inlines into a class scope // Returns the source frames needed to resample to destination frames. This is not a precise |