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

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

Merge "Do not report error for playback rate/pitch of 1.0" am: 858768c1 am:... 

Merge "Do not report error for playback rate/pitch of 1.0" am: 858768c1 am: 43674c6d am: 5c3cd280 am: 1869ab31

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



Change-Id: Ieebd5ac5b0b52d72074e9c769266b93512aeb015
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6cf343e 1869ab31

media/libaudioclient/AudioTrack.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,10 @@ status_t AudioTrack::setPlaybackRate(const AudioPlaybackRate &playbackRate) 
                        legacy2aidl_audio_playback_rate_t_AudioPlaybackRate(playbackRate))));

        if (status == NO_ERROR) {

            mPlaybackRate = playbackRate;

        } else if (status == INVALID_OPERATION

                && playbackRate.mSpeed == 1.0f && mPlaybackRate.mPitch == 1.0f) {

            mPlaybackRate = playbackRate;

            return NO_ERROR;

        }

        return status;

    }