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

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

Merge "av: audioflinger: reduce duplicate code" am: e25b43e7 am: fc63d96b 

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



Change-Id: I405ed85ed2ddd256ca112202fc4f81b1d27f68ac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ded45ab fc63d96b

services/audioflinger/PlaybackTracks.h

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ protected: 
        binder::Status unmute(/*out*/ bool *ret) override;

    private:

        Track* const mTrack;

        bool setMute(bool muted);

    };

    sp<AudioVibrationController> mAudioVibrationController;

    sp<os::ExternalVibration>    mExternalVibration;

services/audioflinger/Tracks.cpp

+10 −17
Original line number Diff line number Diff line
@@ -1915,9 +1915,7 @@ void AudioFlinger::PlaybackThread::Track::updateTrackFrameInfo( 
    }

}



binder::Status AudioFlinger::PlaybackThread::Track::AudioVibrationController::mute(

        /*out*/ bool *ret) {

    *ret = false;

bool AudioFlinger::PlaybackThread::Track::AudioVibrationController::setMute(bool muted) {

    sp<ThreadBase> thread = mTrack->mThread.promote();

    if (thread != 0) {

        // Lock for updating mHapticPlaybackEnabled.
@@ -1925,27 +1923,22 @@ binder::Status AudioFlinger::PlaybackThread::Track::AudioVibrationController::mu 
        PlaybackThread *playbackThread = (PlaybackThread *)thread.get();

        if ((mTrack->channelMask() & AUDIO_CHANNEL_HAPTIC_ALL) != AUDIO_CHANNEL_NONE

                && playbackThread->mHapticChannelCount > 0) {

            mTrack->setHapticPlaybackEnabled(false);

            *ret = true;

            mTrack->setHapticPlaybackEnabled(!muted);

            return true;

        }

    }

    return false;

}



binder::Status AudioFlinger::PlaybackThread::Track::AudioVibrationController::mute(

        /*out*/ bool *ret) {

    *ret = setMute(true);

    return binder::Status::ok();

}



binder::Status AudioFlinger::PlaybackThread::Track::AudioVibrationController::unmute(

        /*out*/ bool *ret) {

    *ret = false;

    sp<ThreadBase> thread = mTrack->mThread.promote();

    if (thread != 0) {

        // Lock for updating mHapticPlaybackEnabled.

        Mutex::Autolock _l(thread->mLock);

        PlaybackThread *playbackThread = (PlaybackThread *)thread.get();

        if ((mTrack->channelMask() & AUDIO_CHANNEL_HAPTIC_ALL) != AUDIO_CHANNEL_NONE

                && playbackThread->mHapticChannelCount > 0) {

            mTrack->setHapticPlaybackEnabled(true);

            *ret = true;

        }

    }

    *ret = setMute(false);

    return binder::Status::ok();

}