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

Commit 56576728 authored by Gareth Fenn's avatar Gareth Fenn Committed by Andy Hung
Browse files

Prevent TunerHAL passthrough from going into standby 

Test: compiles, see bug
Bug: 226349461
Merged-In: Ic5175bc79cf699cbacf9799940bdf5abfd87a3a3
Change-Id: Ic5175bc79cf699cbacf9799940bdf5abfd87a3a3
parent 9e661ad8

services/audioflinger/AudioFlinger.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2840,13 +2840,15 @@ sp<AudioFlinger::ThreadBase> AudioFlinger::openOutput_l(audio_module_handle_t mo 
                ALOGV("openOutput_l() created spatializer output: ID %d thread %p",

                      *output, thread.get());

            } else if (flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {

                thread = new OffloadThread(this, outputStream, *output, mSystemReady);

                thread = new OffloadThread(this, outputStream, *output,

                        mSystemReady, halConfig->offload_info);

                ALOGV("openOutput_l() created offload output: ID %d thread %p",

                      *output, thread.get());

            } else if ((flags & AUDIO_OUTPUT_FLAG_DIRECT)

                    || !isValidPcmSinkFormat(halConfig->format)

                    || !isValidPcmSinkChannelMask(halConfig->channel_mask)) {

                thread = new DirectOutputThread(this, outputStream, *output, mSystemReady);

                thread = new DirectOutputThread(this, outputStream, *output,

                        mSystemReady, halConfig->offload_info);

                ALOGV("openOutput_l() created direct output: ID %d thread %p",

                      *output, thread.get());

            } else {

services/audioflinger/Threads.cpp

+10 −5
Original line number Diff line number Diff line
@@ -6105,8 +6105,10 @@ void AudioFlinger::MixerThread::cacheParameters_l() 
// ----------------------------------------------------------------------------



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

        AudioStreamOut* output, audio_io_handle_t id, ThreadBase::type_t type, bool systemReady)

        AudioStreamOut* output, audio_io_handle_t id, ThreadBase::type_t type, bool systemReady,

        const audio_offload_info_t& offloadInfo)

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

    , mOffloadInfo(offloadInfo)

{

    setMasterBalance(audioFlinger->getMasterBalance_l());

}
@@ -6372,7 +6374,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep 
                // fill a buffer, then remove it from active list.

                // Only consider last track started for mixer state control

                bool isTimestampAdvancing = mIsTimestampAdvancing.check(mOutput);

                if (--(track->mRetryCount) <= 0) {

                if (!isTunerStream()  // tuner streams remain active in underrun

                        && --(track->mRetryCount) <= 0) {

                    if (isTimestampAdvancing) { // HAL is still playing audio, give us more time.

                        track->mRetryCount = kMaxTrackRetriesOffload;

                    } else {
@@ -6735,8 +6738,9 @@ void AudioFlinger::AsyncCallbackThread::setAsyncError() 


// ----------------------------------------------------------------------------

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

        AudioStreamOut* output, audio_io_handle_t id, bool systemReady)

    :   DirectOutputThread(audioFlinger, output, id, OFFLOAD, systemReady),

        AudioStreamOut* output, audio_io_handle_t id, bool systemReady,

        const audio_offload_info_t& offloadInfo)

    :   DirectOutputThread(audioFlinger, output, id, OFFLOAD, systemReady, offloadInfo),

        mPausedWriteLength(0), mPausedBytesRemaining(0), mKeepWakeLock(true)

{

    //FIXME: mStandby should be set to true by ThreadBase constructo
@@ -6955,7 +6959,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
                // No buffers for this track. Give it a few chances to

                // fill a buffer, then remove it from active list.

                bool isTimestampAdvancing = mIsTimestampAdvancing.check(mOutput);

                if (--(track->mRetryCount) <= 0) {

                if (!isTunerStream()  // tuner streams remain active in underrun

                        && --(track->mRetryCount) <= 0) {

                    if (isTimestampAdvancing) { // HAL is still playing audio, give us more time.

                        track->mRetryCount = kMaxTrackRetriesOffload;

                    } else {

services/audioflinger/Threads.h

+9 −4
Original line number Diff line number Diff line
@@ -1540,8 +1540,9 @@ class DirectOutputThread : public PlaybackThread { 
public:



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

                       audio_io_handle_t id, bool systemReady)

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

                       audio_io_handle_t id, bool systemReady,

                       const audio_offload_info_t& offloadInfo)

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



    virtual                 ~DirectOutputThread();
@@ -1573,11 +1574,14 @@ protected: 


    virtual     void        onAddNewTrack_l();



    const       audio_offload_info_t mOffloadInfo;

    bool mVolumeShaperActive = false;



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

                       audio_io_handle_t id, ThreadBase::type_t type, bool systemReady);

                       audio_io_handle_t id, ThreadBase::type_t type, bool systemReady,

                       const audio_offload_info_t& offloadInfo);

    void processVolume_l(Track *track, bool lastTrack);

    bool isTunerStream() const { return (mOffloadInfo.content_id > 0); }



    // prepareTracks_l() tells threadLoop_mix() the name of the single active track

    sp<Track>               mActiveTrack;
@@ -1615,7 +1619,8 @@ class OffloadThread : public DirectOutputThread { 
public:



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

                  audio_io_handle_t id, bool systemReady);

                  audio_io_handle_t id, bool systemReady,

                  const audio_offload_info_t& offloadInfo);

    virtual                 ~OffloadThread() {};

                void        flushHw_l() override;