commit 289468a303bd54b11f1555a20504931c8ab69797
author Mikhail Naganov <mnaganov@google.com> Wed Mar 29 10:06:15 2023 -0700
committer Mikhail Naganov <mnaganov@google.com> Thu Mar 30 20:31:50 2023 -0700
tree e1826cbca4bbda34276281c25566f70b2085c623
parent e93a086751b7a1f6a658e99e2896c528881b18f9

libaudiohal@aidl: Consider routing when finding mix ports

While looking up a mix port from configuration,
the destination port id(s) must be considered to avoid
selecting a mix port which can't be routed to the
device specified for stream opening.

Bug: 275341432
Test: atest audiorecord_tests
Test: atest trackplayerbase_tests
Change-Id: I92b5e430326ef0b044e01b9cbd5ec82e9d4c06c3
Merged-In: I92b5e430326ef0b044e01b9cbd5ec82e9d4c06c3

media/libaudiohal/impl/DeviceHalAidl.h

diff --git a/media/libaudiohal/impl/DeviceHalAidl.h b/media/libaudiohal/impl/DeviceHalAidl.h
index 35429ca..fd0cd54 100644
--- a/media/libaudiohal/impl/DeviceHalAidl.h
+++ b/media/libaudiohal/impl/DeviceHalAidl.h
@@ -181,6 +181,9 @@
     using PortConfigs = std::map<int32_t /*port config ID*/,
             ::aidl::android::media::audio::common::AudioPortConfig>;
     using Ports = std::map<int32_t /*port ID*/, ::aidl::android::media::audio::common::AudioPort>;
+    // Answers the question "whether portID 'first' is reachable from portID 'second'?"
+    // It's not a map because both portIDs are known. The matrix is symmetric.
+    using RoutingMatrix = std::set<std::pair<int32_t, int32_t>>;
     using Streams = std::map<wp<StreamHalInterface>, int32_t /*patch ID*/>;
     class Cleanups;
 
@@ -215,16 +218,19 @@
             const std::optional<::aidl::android::media::audio::common::AudioIoFlags>& flags,
             int32_t ioHandle,
             ::aidl::android::media::audio::common::AudioSource aidlSource,
+            const std::set<int32_t>& destinationPortIds,
             ::aidl::android::media::audio::common::AudioPortConfig* portConfig, bool* created);
     status_t findOrCreatePortConfig(
         const ::aidl::android::media::audio::common::AudioPortConfig& requestedPortConfig,
+        const std::set<int32_t>& destinationPortIds,
         ::aidl::android::media::audio::common::AudioPortConfig* portConfig, bool* created);
     Patches::iterator findPatch(const std::set<int32_t>& sourcePortConfigIds,
             const std::set<int32_t>& sinkPortConfigIds);
     Ports::iterator findPort(const ::aidl::android::media::audio::common::AudioDevice& device);
     Ports::iterator findPort(
             const ::aidl::android::media::audio::common::AudioConfig& config,
-            const ::aidl::android::media::audio::common::AudioIoFlags& flags);
+            const ::aidl::android::media::audio::common::AudioIoFlags& flags,
+            const std::set<int32_t>& destinationPortIds);
     PortConfigs::iterator findPortConfig(
             const ::aidl::android::media::audio::common::AudioDevice& device);
     PortConfigs::iterator findPortConfig(
@@ -246,6 +252,7 @@
     void resetUnusedPatches();
     void resetUnusedPatchesAndPortConfigs();
     void resetUnusedPortConfigs();
+    status_t updateRoutes();
 
     // CallbackBroker implementation
     void clearCallbacks(void* cookie) override;
@@ -272,6 +279,7 @@
     int32_t mDefaultOutputPortId = -1;
     PortConfigs mPortConfigs;
     Patches mPatches;
+    RoutingMatrix mRoutingMatrix;
     Streams mStreams;
     Microphones mMicrophones;
     std::mutex mLock;