audio: rename virtualizer stage to spatializer
Use audio spatializer and spatialization instead of
virtualizer stage to reflect the name chosen for public APIs.
Bug: 188502620
Test: make
Change-Id: I7974c5b159722efd795e0b0b79ddbb0658c52034
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 17ecf21..a77a27d 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2569,10 +2569,10 @@
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());
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index d3cae76..1d9f82c 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -7064,7 +7064,7 @@
// ----------------------------------------------------------------------------
-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 @@
{
}
-void AudioFlinger::VirtualizerStageThread::checkOutputStageEffects()
+void AudioFlinger::SpatializerThread::checkOutputStageEffects()
{
bool hasVirtualizer = false;
bool hasDownMixer = false;
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index b9801c2..33a83e1 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -1658,14 +1658,14 @@
}
};
-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; }
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
index 9837336..1d0d5bc 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h
@@ -202,9 +202,9 @@
{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()) {
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
index 6c3386f..8be874e 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
@@ -545,7 +545,7 @@
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);
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index a20612e..e0ef50b 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -250,7 +250,7 @@
|| (((desc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) != 0) &&
(desc->mDirectOpenCount == 0))
|| (((desc->mFlags & AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE) != 0) &&
- (desc != mVirtualizerStageOutput))) {
+ (desc != mSpatializerOutput))) {
clearAudioSourcesForOutput(output);
closeOutput(output);
}
@@ -927,7 +927,7 @@
return profile;
}
-sp<IOProfile> AudioPolicyManager::getVirtualizerStageOutputProfile(
+sp<IOProfile> AudioPolicyManager::getSpatializerOutputProfile(
const audio_config_t *config __unused, const AudioDeviceTypeAddrVector &devices,
bool forOpening) const
{
@@ -1377,9 +1377,9 @@
ALOGV("Set VoIP and Direct output flags for PCM format");
}
- if (mVirtualizerStageOutput != nullptr
- && canBeVirtualized(attr, config, devices.toTypeAddrVector())) {
- return mVirtualizerStageOutput->mIoHandle;
+ if (mSpatializerOutput != nullptr
+ && canBeSpatialized(attr, config, devices.toTypeAddrVector())) {
+ return mSpatializerOutput->mIoHandle;
}
audio_config_t directConfig = *config;
@@ -4843,13 +4843,13 @@
return source;
}
-bool AudioPolicyManager::canBeVirtualized(const audio_attributes_t *attr,
+bool AudioPolicyManager::canBeSpatialized(const audio_attributes_t *attr,
const audio_config_t *config,
const AudioDeviceTypeAddrVector &devices) const
{
// The caller can have the audio attributes criteria ignored by either passing a null ptr or
// the AUDIO_ATTRIBUTES_INITIALIZER value.
- // If attributes are specified, current policy is to only allow virtualization for media
+ // If attributes are specified, current policy is to only allow spatialization for media
// and game usages.
if (attr != nullptr && *attr != AUDIO_ATTRIBUTES_INITIALIZER &&
attr->usage != AUDIO_USAGE_MEDIA && attr->usage != AUDIO_USAGE_GAME) {
@@ -4857,29 +4857,29 @@
}
// The caller can have the devices criteria ignored by passing and empty vector, and
- // getVirtualizerStageOutputProfile() will ignore the devices when looking for a match.
- // Otherwise an output profile supporting a virtualizer stage effect that can be routed
+ // getSpatializerOutputProfile() will ignore the devices when looking for a match.
+ // Otherwise an output profile supporting a spatializer effect that can be routed
// to the specified devices must exist.
sp<IOProfile> profile =
- getVirtualizerStageOutputProfile(config, devices, false /*forOpening*/);
+ getSpatializerOutputProfile(config, devices, false /*forOpening*/);
if (profile == nullptr) {
return false;
}
// The caller can have the audio config criteria ignored by either passing a null ptr or
// the AUDIO_CONFIG_INITIALIZER value.
- // If an audio config is specified, current policy is to only allow virtualization for
+ // If an audio config is specified, current policy is to only allow spatialization for
// 5.1, 7.1and 7.1.4 audio.
- // If the virtualizer stage output is already opened, only channel masks included in the
- // virtualizer stage output mixer channel mask are allowed.
+ // If the spatializer output is already opened, only channel masks included in the
+ // spatializer output mixer channel mask are allowed.
if (config != nullptr && *config != AUDIO_CONFIG_INITIALIZER) {
if (config->channel_mask != AUDIO_CHANNEL_OUT_5POINT1
&& config->channel_mask != AUDIO_CHANNEL_OUT_7POINT1
&& config->channel_mask != AUDIO_CHANNEL_OUT_7POINT1POINT4) {
return false;
}
- if (mVirtualizerStageOutput != nullptr) {
- if ((config->channel_mask & mVirtualizerStageOutput->mMixerChannelMask)
+ if (mSpatializerOutput != nullptr) {
+ if ((config->channel_mask & mSpatializerOutput->mMixerChannelMask)
!= config->channel_mask) {
return false;
}
@@ -4899,7 +4899,7 @@
AudioDeviceTypeAddrVector devicesTypeAddress = devices.toTypeAddrVector();
audio_config_base_t clientConfig = client->config();
audio_config_t config = audio_config_initializer(&clientConfig);
- if (canBeVirtualized(&attr, &config, devicesTypeAddress)) {
+ if (canBeSpatialized(&attr, &config, devicesTypeAddress)) {
streamsToInvalidate.insert(client->stream());
}
}
@@ -4910,12 +4910,12 @@
}
}
-status_t AudioPolicyManager::getVirtualizerStageOutput(const audio_config_base_t *mixerConfig,
+status_t AudioPolicyManager::getSpatializerOutput(const audio_config_base_t *mixerConfig,
const audio_attributes_t *attr,
audio_io_handle_t *output) {
*output = AUDIO_IO_HANDLE_NONE;
- if (mVirtualizerStageOutput != nullptr) {
+ if (mSpatializerOutput != nullptr) {
return INVALID_OPERATION;
}
@@ -4927,49 +4927,49 @@
config = audio_config_initializer(mixerConfig);
configPtr = &config;
}
- if (!canBeVirtualized(attr, configPtr, devicesTypeAddress)) {
+ if (!canBeSpatialized(attr, configPtr, devicesTypeAddress)) {
return BAD_VALUE;
}
sp<IOProfile> profile =
- getVirtualizerStageOutputProfile(configPtr, devicesTypeAddress, true /*forOpening*/);
+ getSpatializerOutputProfile(configPtr, devicesTypeAddress, true /*forOpening*/);
if (profile == nullptr) {
return BAD_VALUE;
}
- mVirtualizerStageOutput = new SwAudioOutputDescriptor(profile, mpClientInterface);
- status_t status = mVirtualizerStageOutput->open(nullptr, mixerConfig, devices,
+ mSpatializerOutput = new SwAudioOutputDescriptor(profile, mpClientInterface);
+ status_t status = mSpatializerOutput->open(nullptr, mixerConfig, devices,
mEngine->getStreamTypeForAttributes(*attr),
AUDIO_OUTPUT_FLAG_VIRTUALIZER_STAGE, output);
if (status != NO_ERROR) {
ALOGV("%s failed opening output: status %d, output %d", __func__, status, *output);
if (*output != AUDIO_IO_HANDLE_NONE) {
- mVirtualizerStageOutput->close();
+ mSpatializerOutput->close();
}
- mVirtualizerStageOutput.clear();
+ mSpatializerOutput.clear();
*output = AUDIO_IO_HANDLE_NONE;
return status;
}
checkVirtualizerClientRoutes();
- addOutput(*output, mVirtualizerStageOutput);
+ addOutput(*output, mSpatializerOutput);
mPreviousOutputs = mOutputs;
mpClientInterface->onAudioPortListUpdate();
- ALOGV("%s returns new virtualizer stage output %d", __func__, *output);
+ ALOGV("%s returns new spatializer output %d", __func__, *output);
return NO_ERROR;
}
-status_t AudioPolicyManager::releaseVirtualizerStageOutput(audio_io_handle_t output) {
- if (mVirtualizerStageOutput == nullptr) {
+status_t AudioPolicyManager::releaseSpatializerOutput(audio_io_handle_t output) {
+ if (mSpatializerOutput == nullptr) {
return INVALID_OPERATION;
}
- if (mVirtualizerStageOutput->mIoHandle != output) {
+ if (mSpatializerOutput->mIoHandle != output) {
return BAD_VALUE;
}
closeOutput(output);
- mVirtualizerStageOutput.clear();
+ mSpatializerOutput.clear();
return NO_ERROR;
}
@@ -5022,8 +5022,8 @@
ALOGE("could not load audio policy configuration file, setting defaults");
getConfig().setDefault();
}
- //TODO: b/193496180 use virtualizer stage flag at audio HAL when available
- getConfig().convertVirtualizerStageFlag();
+ //TODO: b/193496180 use spatializer flag at audio HAL when available
+ getConfig().convertSpatializerFlag();
}
status_t AudioPolicyManager::initialize() {
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 8668f5e..fd5c58f 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -356,15 +356,15 @@
BAD_VALUE : NO_ERROR;
}
- virtual bool canBeVirtualized(const audio_attributes_t *attr,
+ virtual bool canBeSpatialized(const audio_attributes_t *attr,
const audio_config_t *config,
const AudioDeviceTypeAddrVector &devices) const;
- virtual status_t getVirtualizerStageOutput(const audio_config_base_t *config,
+ virtual status_t getSpatializerOutput(const audio_config_base_t *config,
const audio_attributes_t *attr,
audio_io_handle_t *output);
- virtual status_t releaseVirtualizerStageOutput(audio_io_handle_t output);
+ virtual status_t releaseSpatializerOutput(audio_io_handle_t output);
bool isCallScreenModeSupported() override;
@@ -807,7 +807,7 @@
sp<SwAudioOutputDescriptor> mPrimaryOutput; // primary output descriptor
// list of descriptors for outputs currently opened
- sp<SwAudioOutputDescriptor> mVirtualizerStageOutput;
+ sp<SwAudioOutputDescriptor> mSpatializerOutput;
SwAudioOutputCollection mOutputs;
// copy of mOutputs before setDeviceConnectionState() opens new outputs
@@ -961,7 +961,7 @@
const DeviceVector &devices,
audio_io_handle_t *output);
- sp<IOProfile> getVirtualizerStageOutputProfile(const audio_config_t *config,
+ sp<IOProfile> getSpatializerOutputProfile(const audio_config_t *config,
const AudioDeviceTypeAddrVector &devices,
bool forOpening) const;