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

Commit b87c0687 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Simplify enable/disable mixing"

parents 255adceb 1c48c3c6

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2202,7 +2202,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track 


            // XXX: these things DON'T need to be done each time

            mAudioMixer->setBufferProvider(track);

            mAudioMixer->enable(AudioMixer::MIXING);

            mAudioMixer->enable();



            mAudioMixer->setParameter(param, AudioMixer::VOLUME0, (void *)left);

            mAudioMixer->setParameter(param, AudioMixer::VOLUME1, (void *)right);
@@ -2248,7 +2248,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track 
                    mixerStatus = MIXER_TRACKS_ENABLED;

                }

            }

            mAudioMixer->disable(AudioMixer::MIXING);

            mAudioMixer->disable();

        }

    }

services/audioflinger/AudioMixer.cpp

+10 −24
Original line number Diff line number Diff line
@@ -143,36 +143,22 @@ void AudioMixer::deleteTrackName(int name) 
    }

}



status_t AudioMixer::enable(int name)

void AudioMixer::enable()

{

    switch (name) {

        case MIXING: {

    if (mState.tracks[ mActiveTrack ].enabled != 1) {

        mState.tracks[ mActiveTrack ].enabled = 1;

        ALOGV("enable(%d)", mActiveTrack);

        invalidateState(1<<mActiveTrack);

    }

        } break;

        default:

            return NAME_NOT_FOUND;

    }

    return NO_ERROR;

}



status_t AudioMixer::disable(int name)

void AudioMixer::disable()

{

    switch (name) {

        case MIXING: {

    if (mState.tracks[ mActiveTrack ].enabled != 0) {

        mState.tracks[ mActiveTrack ].enabled = 0;

        ALOGV("disable(%d)", mActiveTrack);

        invalidateState(1<<mActiveTrack);

    }

        } break;

        default:

            return NAME_NOT_FOUND;

    }

    return NO_ERROR;

}



status_t AudioMixer::setActiveTrack(int track)

services/audioflinger/AudioMixer.h

+3 −4
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ public: 
        // track units (32 units)

        TRACK0          = 0x1000,



        // enable/disable

        MIXING          = 0x2000,

        // 0x2000 is unused



        // setParameter targets

        TRACK           = 0x3000,
@@ -78,8 +77,8 @@ public: 
    int         getTrackName();

    void        deleteTrackName(int name);



    status_t    enable(int name);

    status_t    disable(int name);

    void        enable();

    void        disable();



    status_t    setActiveTrack(int track);

    status_t    setParameter(int target, int name, void *value);