commit 19c47afbc402542720ddd280e1bbde3b2277b586
author Andy Hung <hunga@google.com> Wed Dec 02 15:55:23 2015 -0800
committer Andy Hung <hunga@google.com> Wed Dec 02 18:05:32 2015 -0800
tree d2c3657298566f4466ea0f6ee51217ffe1a9b7a1
parent 09c291c838bc74bb7c10c22f7232abb946cad8ff

DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread

Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.

Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8

include/media/SoundPool.h

diff --git a/include/media/SoundPool.h b/include/media/SoundPool.h
index 5830475..f57313c 100644
--- a/include/media/SoundPool.h
+++ b/include/media/SoundPool.h
@@ -187,6 +187,7 @@
 
     // called from SoundPoolThread
     void sampleLoaded(int sampleID);
+    sp<Sample> findSample(int sampleID);
 
     // called from AudioTrack thread
     void done_l(SoundChannel* channel);
@@ -198,8 +199,7 @@
 private:
     SoundPool() {} // no default constructor
     bool startThreads();
-    void doLoad(sp<Sample>& sample);
-    sp<Sample> findSample(int sampleID) { return mSamples.valueFor(sampleID); }
+    sp<Sample> findSample_l(int sampleID);
     SoundChannel* findChannel (int channelID);
     SoundChannel* findNextChannel (int channelID);
     SoundChannel* allocateChannel_l(int priority);