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/include | |
| 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/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ private: 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(); |