diff options
| author | Edwin Wong <edwinwong@google.com> | 2012-05-02 18:57:12 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2012-05-02 21:14:01 -0700 |
| commit | 6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b (patch) | |
| tree | d1bc11b152a23453f52b4b86eea8fb95da229745 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 359f90cea8a59c4a8d25b422fd0b0569e31db2fa (diff) | |
| download | frameworks_av-6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b.zip frameworks_av-6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b.tar.gz frameworks_av-6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { } } } else if (!strcasecmp(mime.string(), MEDIA_MIMETYPE_TEXT_3GPP)) { - addTextSource(i, extractor->getTrack(i)); + addTextSource_l(i, extractor->getTrack(i)); } } @@ -1347,8 +1347,7 @@ void AwesomePlayer::setAudioSource(sp<MediaSource> source) { 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) { |