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

Commit 828ee90b authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audio: rename virtualizer stage to spatializer" into sc-v2-dev am: 3e295742 

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

Change-Id: Ib3cb100ff065c050185f72689f3527e929089e9c
parents 0257e14f 3e295742

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2570,10 +2570,10 @@ sp<AudioFlinger::ThreadBase> AudioFlinger::openOutput_l(audio_module_handle_t mo 
            return thread;

        } else {

            sp<PlaybackThread> thread;

            //TODO: b/193496180 use virtualizer stage flag at audio HAL when available

            //TODO: b/193496180 use spatializer flag at audio HAL when available

            if (flags == (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_FAST

                                                    | AUDIO_OUTPUT_FLAG_DEEP_BUFFER)) {

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

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

                                                    mSystemReady, mixerConfig);

                ALOGD("openOutput_l() created virtualizer output: ID %d thread %p",

                      *output, thread.get());

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7064,7 +7064,7 @@ void AudioFlinger::DuplicatingThread::cacheParameters_l() 


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



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

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

                                                             AudioStreamOut* output,

                                                             audio_io_handle_t id,

                                                             bool systemReady,
@@ -7073,7 +7073,7 @@ AudioFlinger::VirtualizerStageThread::VirtualizerStageThread(const sp<AudioFling 
{

}



void AudioFlinger::VirtualizerStageThread::checkOutputStageEffects()

void AudioFlinger::SpatializerThread::checkOutputStageEffects()

{

    bool hasVirtualizer = false;

    bool hasDownMixer = false;

services/audioflinger/Threads.h

+3 −3
Original line number Diff line number Diff line
@@ -1658,14 +1658,14 @@ public: 
    }

};



class VirtualizerStageThread : public MixerThread {

class SpatializerThread : public MixerThread {

public:

    VirtualizerStageThread(const sp<AudioFlinger>& audioFlinger,

    SpatializerThread(const sp<AudioFlinger>& audioFlinger,

                           AudioStreamOut* output,

                           audio_io_handle_t id,

                           bool systemReady,

                           audio_config_base_t *mixerConfig);

            ~VirtualizerStageThread() override {}

            ~SpatializerThread() override {}



            bool hasFastMixer() const override { return false; }

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+3 −3
Original line number Diff line number Diff line
@@ -202,9 +202,9 @@ public: 
            {AUDIO_FORMAT_AC4, {}}};

    }



    //TODO: b/193496180 use virtualizer stage flag at audio HAL when available

    // until then, use DEEP_BUFFER+FAST flag combo to indicate the virtualizer stage output profile

    void convertVirtualizerStageFlag()

    //TODO: b/193496180 use spatializer flag at audio HAL when available

    // until then, use DEEP_BUFFER+FAST flag combo to indicate the spatializer output profile

    void convertSpatializerFlag()

    {

        for (const auto& hwModule : mHwModules) {

            for (const auto& curProfile : hwModule->getOutputProfiles()) {

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ status_t SwAudioOutputDescriptor::open(const audio_config_t *halConfig, 


    mFlags = (audio_output_flags_t)(mFlags | flags);



    //TODO: b/193496180 use virtualizer stage flag at audio HAL when available

    //TODO: b/193496180 use spatializer flag at audio HAL when available

    audio_output_flags_t halFlags = mFlags;

    if ((mFlags & AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE) != 0) {

        halFlags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_DEEP_BUFFER);