diff options
| author | Marco Nelissen <marcone@google.com> | 2009-07-10 09:34:59 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2009-07-10 13:43:41 -0700 |
| commit | aa37173500f221298fa618b5ca8b4814aff5ef31 (patch) | |
| tree | edfcaf21dd1a67bd699fb1207c3423c4c72efe27 /media/libmedia/mediaplayer.cpp | |
| parent | 8e1b6cce24574b9ecd5b0300155776bd0b4ef756 (diff) | |
| download | frameworks_av-aa37173500f221298fa618b5ca8b4814aff5ef31.zip frameworks_av-aa37173500f221298fa618b5ca8b4814aff5ef31.tar.gz frameworks_av-aa37173500f221298fa618b5ca8b4814aff5ef31.tar.bz2 | |
Don't pass references to temporary objects, and handle the case where we dont have a Surface.
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 6b35fa7..aeb43c5 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -233,7 +233,10 @@ status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface) LOGV("setVideoSurface"); Mutex::Autolock _l(mLock); if (mPlayer == 0) return NO_INIT; - return mPlayer->setVideoSurface(surface->getISurface()); + if (surface != NULL) + return mPlayer->setVideoSurface(surface->getISurface()); + else + return mPlayer->setVideoSurface(NULL); } // must call with lock held |