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

Commit fe0dee1e authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger: Fix VolumeShaper initialization for DirectOutputThread"

parents af87b707 48f59ed6

services/audioflinger/Threads.cpp

+1 −8
Original line number Diff line number Diff line
@@ -5329,16 +5329,9 @@ void AudioFlinger::MixerThread::cacheParameters_l() 
// ----------------------------------------------------------------------------



AudioFlinger::DirectOutputThread::DirectOutputThread(const sp<AudioFlinger>& audioFlinger,

        AudioStreamOut* output, audio_io_handle_t id, audio_devices_t device, bool systemReady)

    :   PlaybackThread(audioFlinger, output, id, device, DIRECT, systemReady)

{

}



AudioFlinger::DirectOutputThread::DirectOutputThread(const sp<AudioFlinger>& audioFlinger,

        AudioStreamOut* output, audio_io_handle_t id, uint32_t device,

        AudioStreamOut* output, audio_io_handle_t id, audio_devices_t device,

        ThreadBase::type_t type, bool systemReady)

    :   PlaybackThread(audioFlinger, output, id, device, type, systemReady)

        , mVolumeShaperActive(false)

{

}

services/audioflinger/Threads.h

+5 −3
Original line number Diff line number Diff line
@@ -1205,7 +1205,9 @@ class DirectOutputThread : public PlaybackThread { 
public:



    DirectOutputThread(const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output,

                       audio_io_handle_t id, audio_devices_t device, bool systemReady);

                       audio_io_handle_t id, audio_devices_t device, bool systemReady)

        : DirectOutputThread(audioFlinger, output, id, device, DIRECT, systemReady) { }



    virtual                 ~DirectOutputThread();



                status_t    selectPresentation(int presentationId, int programId);
@@ -1231,10 +1233,10 @@ protected: 


    virtual     void        onAddNewTrack_l();



    bool mVolumeShaperActive;

    bool mVolumeShaperActive = false;



    DirectOutputThread(const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output,

                        audio_io_handle_t id, uint32_t device, ThreadBase::type_t type,

                        audio_io_handle_t id, audio_devices_t device, ThreadBase::type_t type,

                        bool systemReady);

    void processVolume_l(Track *track, bool lastTrack);