commit ae9063dd6316f0f4bad2a411e0b0ad8f1681e546
author Mikhail Naganov <mnaganov@google.com> Tue Nov 07 16:43:51 2023 -0800
committer Mikhail Naganov <mnaganov@google.com> Tue Nov 14 10:34:30 2023 -0800
tree 6690de036f257a8ca92450fa623b5f30e062af34
parent 9b59b0652db6852837384bb0eca17963c21a7492

libaudiohal@aidl: Properly handle "legacy" r_submix case

The "legacy" r_submix case is the "default" remote submix
device with the address "0". For backwards compatibility,
the input for this device must be attached. The output
is still opened dynamically. However, the framework expects
to see a declared device with address "0" and some profiles.

Added code to libaudiohal@aidl to perform this adaptation.
Also, found that `DeviceDescriptor` was missing setting
`mDeclaredAddress` when loading from a parcelable.

Bug: 302036943
Test: atest audioeffect_analysis
Test: atest CtsMediaAudioTestCases --test-filter=".*AudioPlaybackCaptureTest.*"
Change-Id: I28294cbb2895e648fe962feb3e9a0645fc823153

media/libaudiohal/impl/DeviceHalAidl.h

diff --git a/media/libaudiohal/impl/DeviceHalAidl.h b/media/libaudiohal/impl/DeviceHalAidl.h
index e1fe4d1..99e8503 100644
--- a/media/libaudiohal/impl/DeviceHalAidl.h
+++ b/media/libaudiohal/impl/DeviceHalAidl.h
@@ -223,6 +223,7 @@
     status_t createOrUpdatePortConfig(
             const ::aidl::android::media::audio::common::AudioPortConfig& requestedPortConfig,
             PortConfigs::iterator* result, bool *created);
+    void eraseConnectedPort(int32_t portId);
     status_t filterAndRetrieveBtA2dpParameters(AudioParameter &keys, AudioParameter *result);
     status_t filterAndUpdateBtA2dpParameters(AudioParameter &parameters);
     status_t filterAndUpdateBtHfpParameters(AudioParameter &parameters);
@@ -313,6 +314,10 @@
     std::shared_ptr<::aidl::android::hardware::audio::core::sounddose::ISoundDose>
         mSoundDose = nullptr;
     Ports mPorts;
+    // Remote submix "template" ports (no address specified, no profiles).
+    // They are excluded from `mPorts` as their presence confuses the framework code.
+    std::optional<::aidl::android::media::audio::common::AudioPort> mRemoteSubmixIn;
+    std::optional<::aidl::android::media::audio::common::AudioPort> mRemoteSubmixOut;
     int32_t mDefaultInputPortId = -1;
     int32_t mDefaultOutputPortId = -1;
     PortConfigs mPortConfigs;
@@ -326,6 +331,8 @@
     std::map<void*, Callbacks> mCallbacks GUARDED_BY(mLock);
     std::set<audio_port_handle_t> mDeviceDisconnectionNotified;
     ConnectedPorts mConnectedPorts;
+    std::pair<int32_t, ::aidl::android::media::audio::common::AudioPort>
+            mDisconnectedPortReplacement;
 };
 
 } // namespace android