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

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

audio: rename virtualizer stage to spatializer (2) am: 1c5e2e3d am: dac9046e 

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

Change-Id: I1464d57f6ec8f1d0bdf19b0980ddca025d91022b
parents 68bd88ac dac9046e

services/audioflinger/Threads.cpp

+12 −12
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include <system/audio_effects/effect_aec.h>

#include <system/audio_effects/effect_downmix.h>

#include <system/audio_effects/effect_ns.h>

#include <system/audio_effects/effect_virtualizer_stage.h>

#include <system/audio_effects/effect_spatializer.h>

#include <system/audio.h>



// NBAIO implementations
@@ -509,8 +509,8 @@ const char *AudioFlinger::ThreadBase::threadTypeToString(AudioFlinger::ThreadBas 
        return "MMAP_PLAYBACK";

    case MMAP_CAPTURE:

        return "MMAP_CAPTURE";

    case VIRTUALIZER_STAGE:

        return "VIRTUALIZER_STAGE";

    case SPATIALIZER:

        return "SPATIALIZER";

    default:

        return "unknown";

    }
@@ -1037,8 +1037,8 @@ String16 AudioFlinger::ThreadBase::getWakeLockTag() 
        return String16("MmapPlayback");

    case MMAP_CAPTURE:

        return String16("MmapCapture");

    case VIRTUALIZER_STAGE:

        return String16("AudioVirt");

    case SPATIALIZER:

        return String16("AudioSpatial");

    default:

        ALOG_ASSERT(false);

        return String16("AudioUnknown");
@@ -1432,9 +1432,9 @@ status_t AudioFlinger::PlaybackThread::checkEffectCompatibility_l( 
            return BAD_VALUE;

        }

        break;

    case VIRTUALIZER_STAGE:

    case SPATIALIZER:

        if (!audio_is_global_session(sessionId)) {

            ALOGW("checkEffectCompatibility_l(): non global effect %s on VIRTUALIZER_STAGE"

            ALOGW("checkEffectCompatibility_l(): non global effect %s on SPATIALIZER"

                    " thread %s", desc->name, mThreadName);

            return BAD_VALUE;

        }
@@ -1955,12 +1955,12 @@ AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinge 
                                             audio_config_base_t *mixerConfig)

    :   ThreadBase(audioFlinger, id, type, systemReady, true /* isOut */),

        mNormalFrameCount(0), mSinkBuffer(NULL),

        mMixerBufferEnabled(AudioFlinger::kEnableExtendedPrecision || type == VIRTUALIZER_STAGE),

        mMixerBufferEnabled(AudioFlinger::kEnableExtendedPrecision || type == SPATIALIZER),

        mMixerBuffer(NULL),

        mMixerBufferSize(0),

        mMixerBufferFormat(AUDIO_FORMAT_INVALID),

        mMixerBufferValid(false),

        mEffectBufferEnabled(AudioFlinger::kEnableExtendedPrecision || type == VIRTUALIZER_STAGE),

        mEffectBufferEnabled(AudioFlinger::kEnableExtendedPrecision || type == SPATIALIZER),

        mEffectBuffer(NULL),

        mEffectBufferSize(0),

        mEffectBufferFormat(AUDIO_FORMAT_INVALID),
@@ -2018,7 +2018,7 @@ AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinge 


    readOutputParameters_l();



    if (mType != VIRTUALIZER_STAGE

    if (mType != SPATIALIZER

            && mMixerChannelMask != mChannelMask) {

        LOG_ALWAYS_FATAL("HAL channel mask %#x does not match mixer channel mask %#x",

                mChannelMask, mMixerChannelMask);
@@ -7079,7 +7079,7 @@ AudioFlinger::SpatializerThread::SpatializerThread(const sp<AudioFlinger>& audio 
                                                             audio_io_handle_t id,

                                                             bool systemReady,

                                                             audio_config_base_t *mixerConfig)

    : MixerThread(audioFlinger, output, id, systemReady, VIRTUALIZER_STAGE, mixerConfig)

    : MixerThread(audioFlinger, output, id, systemReady, SPATIALIZER, mixerConfig)

{

}
@@ -7092,7 +7092,7 @@ void AudioFlinger::SpatializerThread::checkOutputStageEffects() 
        Mutex::Autolock _l(mLock);

        sp<EffectChain> chain = getEffectChain_l(AUDIO_SESSION_OUTPUT_STAGE);

        if (chain != 0) {

            hasVirtualizer = chain->getEffectFromType_l(FX_IID_VIRTUALIZER_STAGE) != nullptr;

            hasVirtualizer = chain->getEffectFromType_l(FX_IID_SPATIALIZER) != nullptr;

            hasDownMixer = chain->getEffectFromType_l(EFFECT_UIID_DOWNMIX) != nullptr;

        }

services/audioflinger/Threads.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public: 
        OFFLOAD,            // Thread class is OffloadThread

        MMAP_PLAYBACK,      // Thread class for MMAP playback stream

        MMAP_CAPTURE,       // Thread class for MMAP capture stream

        VIRTUALIZER_STAGE,  //

        SPATIALIZER,  //

        // If you add any values here, also update ThreadBase::threadTypeToString()

    };
@@ -1052,7 +1052,7 @@ public: 
                PlaybackThread::Track* getTrackById_l(audio_port_handle_t trackId);



                bool hasMixer() const {

                    return mType == MIXER || mType == DUPLICATING || mType == VIRTUALIZER_STAGE;

                    return mType == MIXER || mType == DUPLICATING || mType == SPATIALIZER;

                }

protected:

    // updated by readOutputParameters_l()

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public: 
            for (const auto& curProfile : hwModule->getOutputProfiles()) {

                if (curProfile->getFlags()

                        == (AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_DEEP_BUFFER)) {

                    curProfile->setFlags(AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE);

                    curProfile->setFlags(AUDIO_OUTPUT_FLAG_SPATIALIZER);

                }

            }

        }

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

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


    //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) {

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

        halFlags = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_DEEP_BUFFER);

    }

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −4
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(const sp<DeviceDescript 
                    if ((state == AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE)

                            || (((desc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) != 0) &&

                                (desc->mDirectOpenCount == 0))

                            || (((desc->mFlags & AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE) != 0) &&

                            || (((desc->mFlags & AUDIO_OUTPUT_FLAG_SPATIALIZER) != 0) &&

                                (desc != mSpatializerOutput))) {

                        clearAudioSourcesForOutput(output);

                        closeOutput(output);
@@ -933,7 +933,7 @@ sp<IOProfile> AudioPolicyManager::getSpatializerOutputProfile( 
{

    for (const auto& hwModule : mHwModules) {

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

            if (curProfile->getFlags() != AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE) {

            if (curProfile->getFlags() != AUDIO_OUTPUT_FLAG_SPATIALIZER) {

                continue;

            }

            // reject profiles not corresponding to a device currently available
@@ -4941,7 +4941,7 @@ status_t AudioPolicyManager::getSpatializerOutput(const audio_config_base_t *mix 
    mSpatializerOutput = new SwAudioOutputDescriptor(profile, mpClientInterface);

    status_t status = mSpatializerOutput->open(nullptr, mixerConfig, devices,

                                                    mEngine->getStreamTypeForAttributes(*attr),

                                                    AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE, output);

                                                    AUDIO_OUTPUT_FLAG_SPATIALIZER, output);

    if (status != NO_ERROR) {

        ALOGV("%s failed opening output: status %d, output %d", __func__, status, *output);

        if (*output != AUDIO_IO_HANDLE_NONE) {
@@ -5188,7 +5188,7 @@ void AudioPolicyManager::onNewAudioModulesAvailableInt(DeviceVector *newDevices) 
                mPrimaryOutput = outputDesc;

            }

            if ((outProfile->getFlags() & AUDIO_OUTPUT_FLAG_DIRECT) != 0

                || (outProfile->getFlags() & AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE) != 0 ) {

                || (outProfile->getFlags() & AUDIO_OUTPUT_FLAG_SPATIALIZER) != 0 ) {

                outputDesc->close();

            } else {

                addOutput(output, outputDesc);