Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f91dc7dd authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 8fdaf785: Merge "Change the signature of method addTextSource() in AwesomePlayer" 

* commit '8fdaf785':
  Change the signature of method addTextSource() in AwesomePlayer
parents cbf1b972 8fdaf785

media/libstagefright/AwesomePlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ void AwesomePlayer::setAudioSource(sp<MediaSource> source) { 
    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

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ private: 
    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();