Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the signature of method addTextSource() in AwesomePlayer"

Browse Source
This commit is contained in:
James Dong
2012-02-10 17:57:16 -08:00
committed by Android (Google) Code Review
parent e4e04945e7 23cc716cc5
commit 8fdaf785e2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/AwesomePlayer.cpp
View File

@@ -1360,7 +1360,7 @@ void AwesomePlayer::setAudioSource(sp<MediaSource> source) {
mAudioTrack = source; mAudioTrack = source;
} }
void AwesomePlayer::addTextSource(sp<MediaSource> source) { void AwesomePlayer::addTextSource(const sp<MediaSource>& source) {
Mutex::Autolock autoLock(mTimedTextLock); Mutex::Autolock autoLock(mTimedTextLock);
CHECK(source != NULL); CHECK(source != NULL);

2
media/libstagefright/include/AwesomePlayer.h
View File

@@ -258,7 +258,7 @@ private:
void setVideoSource(sp<MediaSource> source); void setVideoSource(sp<MediaSource> source);
status_t initVideoDecoder(uint32_t flags = 0); status_t initVideoDecoder(uint32_t flags = 0);
void addTextSource(sp<MediaSource> source); void addTextSource(const sp<MediaSource>& source);
void onStreamDone(); void onStreamDone();