audio: rename virtualizer stage to spatializer (2)
Update after renaming in system/media includes.
Bug: 188502620
Test: make
Change-Id: I12ed9fbcf2064190d3c59f8003b2d74c07c09a11
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 1d9f82c..767199f 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -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 @@
return "MMAP_PLAYBACK";
case MMAP_CAPTURE:
return "MMAP_CAPTURE";
- case VIRTUALIZER_STAGE:
- return "VIRTUALIZER_STAGE";
+ case SPATIALIZER:
+ return "SPATIALIZER";
default:
return "unknown";
}
@@ -1030,8 +1030,8 @@
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");
@@ -1425,9 +1425,9 @@
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;
}
@@ -1942,12 +1942,12 @@
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),
@@ -2005,7 +2005,7 @@
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);
@@ -7069,7 +7069,7 @@
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)
{
}
@@ -7082,7 +7082,7 @@
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;
}
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index 33a83e1..58864e7 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -32,7 +32,7 @@
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()
};
@@ -1051,7 +1051,7 @@
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()
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
index 1d0d5bc..a8fd856 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
@@ -210,7 +210,7 @@
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);
}
}
}
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
index 8be874e..f3d2326 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
@@ -547,7 +547,7 @@
//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);
}
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index b53180f..a2dbeb2 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -249,7 +249,7 @@
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 @@
{
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
@@ -4940,7 +4940,7 @@
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) {
@@ -5187,7 +5187,7 @@
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);
diff --git a/services/audiopolicy/service/Spatializer.cpp b/services/audiopolicy/service/Spatializer.cpp
index 3383515..345665c 100644
--- a/services/audiopolicy/service/Spatializer.cpp
+++ b/services/audiopolicy/service/Spatializer.cpp
@@ -67,7 +67,7 @@
std::vector<effect_descriptor_t> descriptors;
status_t status =
- effectsFactoryHal->getDescriptors(FX_IID_VIRTUALIZER_STAGE, &descriptors);
+ effectsFactoryHal->getDescriptors(FX_IID_SPATIALIZER, &descriptors);
if (status != NO_ERROR) {
ALOGW("%s failed to get spatializer descriptor, error %d", __func__, status);
return spatializer;
diff --git a/services/audiopolicy/service/Spatializer.h b/services/audiopolicy/service/Spatializer.h
index b177953..f0ab605 100644
--- a/services/audiopolicy/service/Spatializer.h
+++ b/services/audiopolicy/service/Spatializer.h
@@ -23,7 +23,7 @@
#include <android/media/SpatializationLevel.h>
#include <media/AudioEffect.h>
-#include <system/audio_effects/effect_virtualizer_stage.h>
+#include <system/audio_effects/effect_spatializer.h>
namespace android {