commit 6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b
author Edwin Wong <edwinwong@google.com> Wed May 02 18:57:12 2012 -0700
committer Edwin Wong <edwinwong@google.com> Wed May 02 21:14:01 2012 -0700
tree d1bc11b152a23453f52b4b86eea8fb95da229745
parent 359f90cea8a59c4a8d25b422fd0b0569e31db2fa

Removed mutex lock in addTextSource, and rename to addTextSource_l
to indicate this method needs to be called with a lock hold.

Change-Id: I7e99f0a622e7de49c288be09dd4fc955bbca390b
related-to-bug: 5629511
related-to-bug: 5542712

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index cc3fae6..8b92d1e 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -445,7 +445,7 @@
                 }
             }
         } else if (!strcasecmp(mime.string(), MEDIA_MIMETYPE_TEXT_3GPP)) {
-            addTextSource(i, extractor->getTrack(i));
+            addTextSource_l(i, extractor->getTrack(i));
         }
     }
 
@@ -1347,8 +1347,7 @@
     mAudioTrack = source;
 }
 
-void AwesomePlayer::addTextSource(size_t trackIndex, const sp<MediaSource>& source) {
-    Mutex::Autolock autoLock(mLock);
+void AwesomePlayer::addTextSource_l(size_t trackIndex, const sp<MediaSource>& source) {
     CHECK(source != NULL);
 
     if (mTextDriver == NULL) {

media/libstagefright/include/AwesomePlayer.h

diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h
index 1409dc7..909654a 100644
--- a/media/libstagefright/include/AwesomePlayer.h
+++ b/media/libstagefright/include/AwesomePlayer.h
@@ -258,7 +258,7 @@
     void setVideoSource(sp<MediaSource> source);
     status_t initVideoDecoder(uint32_t flags = 0);
 
-    void addTextSource(size_t trackIndex, const sp<MediaSource>& source);
+    void addTextSource_l(size_t trackIndex, const sp<MediaSource>& source);
 
     void onStreamDone();