commit a6f2f169ca9e6803f9ebf06d87fbbcb36cbae01f
author Vlad Popa <pvlad@google.com> Fri Aug 19 15:08:22 2022 +0200
committer Vlad Popa <pvlad@google.com> Thu Aug 25 13:52:08 2022 +0200
tree 71c6e0e5ce8f6baada50f6a60f1ab6963b390cd7
parent f1d9af06a534278ffdb419ad19111875575b7d6f

SoundPool: Assign the java piid to the AudioTrack

This allows to send native playback notifications for SoundPool players.

Test: dumpsys audio
Bug: 235521198
Change-Id: I7e743df4a16e0d8dae9f15f21fb4e8fa01aa4465

media/jni/soundpool/StreamManager.cpp

diff --git a/media/jni/soundpool/StreamManager.cpp b/media/jni/soundpool/StreamManager.cpp
index 487a696..acd4bad 100644
--- a/media/jni/soundpool/StreamManager.cpp
+++ b/media/jni/soundpool/StreamManager.cpp
@@ -151,10 +151,13 @@
 
 int32_t StreamManager::queueForPlay(const std::shared_ptr<Sound> &sound,
         int32_t soundID, float leftVolume, float rightVolume,
-        int32_t priority, int32_t loop, float rate)
+        int32_t priority, int32_t loop, float rate, int32_t playerIId)
 {
-    ALOGV("%s(sound=%p, soundID=%d, leftVolume=%f, rightVolume=%f, priority=%d, loop=%d, rate=%f)",
-            __func__, sound.get(), soundID, leftVolume, rightVolume, priority, loop, rate);
+    ALOGV(
+        "%s(sound=%p, soundID=%d, leftVolume=%f, rightVolume=%f, priority=%d, loop=%d, rate=%f,"
+        " playerIId=%d)", __func__, sound.get(), soundID, leftVolume, rightVolume, priority,
+        loop, rate, playerIId);
+
     bool launchThread = false;
     int32_t streamID = 0;
     std::vector<std::any> garbage;
@@ -244,7 +247,7 @@
             removeFromQueues_l(newStream);
             mProcessingStreams.emplace(newStream);
             lock.unlock();
-            if (Stream* nextStream = newStream->playPairStream(garbage)) {
+            if (Stream* nextStream = newStream->playPairStream(garbage, playerIId)) {
                 lock.lock();
                 ALOGV("%s: starting streamID:%d", __func__, nextStream->getStreamID());
                 addToActiveQueue_l(nextStream);