commit 860936d780d98a5968f40e66ca6ae800c67adbc3
author James Dong <jdong@google.com> Fri Feb 10 17:57:16 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 10 17:57:16 2012 -0800
tree e385efb4808bbed472210480944eaa989c4ad9ea
parent 2b213bc220768d2b984239511cd4554a96bc0079
parent 7c5b72c1ea1a7a8ec40c1364e5e32043799c811f

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

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index aacfbdd..85b7979 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1360,7 +1360,7 @@
     mAudioTrack = source;
 }
 
-void AwesomePlayer::addTextSource(sp<MediaSource> source) {
+void AwesomePlayer::addTextSource(const sp<MediaSource>& source) {
     Mutex::Autolock autoLock(mTimedTextLock);
     CHECK(source != NULL);
 

media/libstagefright/include/AwesomePlayer.h

diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h
index a7a3d47..4c7bfa6 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(sp<MediaSource> source);
+    void addTextSource(const sp<MediaSource>& source);
 
     void onStreamDone();