commit 03b0a0034dfba7d4b93eca1b5638eb1e01a74eb7
author Mikhail Naganov <mnaganov@google.com> Fri May 03 20:22:58 2024 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri May 03 20:22:58 2024 +0000
tree 0b2bb46fc2e0b767ff0601dd9a556b70a2249eec
parent c0a1ab764ea70a6f11f04a8e8330c8cdbbe06b8b

libaudiohal@aidl: Change the criteria for patch matching

The framework may use one device when creating a stream, and then
issue a create audio patch command with a different device but the
same mix port. In this case, the patch created with the stream must be
reused, matching it by the mix port only.

Bug: 333829626
Bug: 336984723
Bug: 337971166
Test: repro steps in bugs
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ef3826833fc864cbef757513caa86e9b5714053)
Merged-In: I71a32087afaef2a5b20e4fba514297c0052fa4c8
Change-Id: I71a32087afaef2a5b20e4fba514297c0052fa4c8

media/libaudiohal/impl/Hal2AidlMapper.h

diff --git a/media/libaudiohal/impl/Hal2AidlMapper.h b/media/libaudiohal/impl/Hal2AidlMapper.h
index f302c23..c70c8af 100644
--- a/media/libaudiohal/impl/Hal2AidlMapper.h
+++ b/media/libaudiohal/impl/Hal2AidlMapper.h
@@ -133,6 +133,8 @@
     using Streams = std::map<wp<StreamHalInterface>,
             std::pair<int32_t /*mix port config ID*/, int32_t /*patch ID*/>>;
 
+    enum PatchMatch { MATCH_SOURCES, MATCH_SINKS, MATCH_BOTH };
+
     const std::string mInstance;
     const std::shared_ptr<::aidl::android::hardware::audio::core::IModule> mModule;
 
@@ -150,11 +152,13 @@
             ::aidl::android::media::audio::common::AudioPortConfig* result, bool *created);
     void eraseConnectedPort(int32_t portId);
     status_t findOrCreatePatch(
-        const std::set<int32_t>& sourcePortConfigIds,
-        const std::set<int32_t>& sinkPortConfigIds,
+            const std::set<int32_t>& sourcePortConfigIds,
+            const std::set<int32_t>& sinkPortConfigIds,
+            PatchMatch match,
         ::aidl::android::hardware::audio::core::AudioPatch* patch, bool* created);
     status_t findOrCreatePatch(
         const ::aidl::android::hardware::audio::core::AudioPatch& requestedPatch,
+        PatchMatch match,
         ::aidl::android::hardware::audio::core::AudioPatch* patch, bool* created);
     status_t findOrCreateDevicePortConfig(
             const ::aidl::android::media::audio::common::AudioDevice& device,
@@ -175,7 +179,7 @@
         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);
+            const std::set<int32_t>& sinkPortConfigIds, PatchMatch match);
     Ports::iterator findPort(const ::aidl::android::media::audio::common::AudioDevice& device);
     Ports::iterator findPort(
             const ::aidl::android::media::audio::common::AudioConfig& config,