commit 1c5e2e3dd2b18067995761eccd4c456bba0f7cef
author Eric Laurent <elaurent@google.com> Wed Aug 18 18:50:28 2021 +0200
committer Eric Laurent <elaurent@google.com> Thu Aug 19 19:41:02 2021 +0000
tree a826fc04cecdca9fcc7a4de72928e41d7d63b9b8
parent 6d60701ee24367f4fa5974a7b1b94925c35c333b

audio: rename virtualizer stage to spatializer (2)

Update after renaming in system/media includes.

Bug: 188502620
Test: make
Change-Id: I12ed9fbcf2064190d3c59f8003b2d74c07c09a11

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

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);