Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 666f0b36 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix AUDIO_TIMESTRETCH_STRETCH value name" am: 2c52d5ae am: 6747608a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1522143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ba5a975ceef2c5c3e4329addff7cee465c1bffe
parents bc0816e6 6747608a

media/libaudioprocessing/include/media/AudioResamplerPublic.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ static inline bool isAudioPlaybackRateEqual(const AudioPlaybackRate &pr1, 




static inline bool isAudioPlaybackRateValid(const AudioPlaybackRate &playbackRate) {

static inline bool isAudioPlaybackRateValid(const AudioPlaybackRate &playbackRate) {

    if (playbackRate.mFallbackMode == AUDIO_TIMESTRETCH_FALLBACK_FAIL &&

    if (playbackRate.mFallbackMode == AUDIO_TIMESTRETCH_FALLBACK_FAIL &&

            (playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_SPEECH ||

            (playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_VOICE ||

                    playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_DEFAULT)) {

                    playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_DEFAULT)) {

        //test sonic specific constraints

        //test sonic specific constraints

        return playbackRate.mSpeed >= TIMESTRETCH_SONIC_SPEED_MIN &&

        return playbackRate.mSpeed >= TIMESTRETCH_SONIC_SPEED_MIN &&