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

Commit 190bca15 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audioflinger: fix OutputTrack initial check" into nyc-mr1-dev

parents 18056e40 af3ec7c9

services/audioflinger/AudioMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ void AudioMixer::deleteTrackName(int name) 
{

    ALOGV("AudioMixer::deleteTrackName(%d)", name);

    name -= TRACK0;

    ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);

    LOG_ALWAYS_FATAL_IF(name < 0 || name >= (int)MAX_NUM_TRACKS, "bad track name %d", name);

    ALOGV("deleteTrackName(%d)", name);

    track_t& track(mState.tracks[ name ]);

    if (track.enabled) {

services/audioflinger/Threads.cpp

+8 −5
Original line number Diff line number Diff line
@@ -5772,13 +5772,16 @@ void AudioFlinger::DuplicatingThread::addOutputTrack(MixerThread *thread) 
                                            mChannelMask,

                                            frameCount,

                                            IPCThreadState::self()->getCallingUid());

    if (outputTrack->cblk() != NULL) {

    status_t status = outputTrack != 0 ? outputTrack->initCheck() : (status_t) NO_MEMORY;

    if (status != NO_ERROR) {

        ALOGE("addOutputTrack() initCheck failed %d", status);

        return;

    }

    thread->setStreamVolume(AUDIO_STREAM_PATCH, 1.0f);

    mOutputTracks.add(outputTrack);

    ALOGV("addOutputTrack() track %p, on thread %p", outputTrack.get(), thread);

    updateWaitTime_l();

}

}



void AudioFlinger::DuplicatingThread::removeOutputTrack(MixerThread *thread)

{