diff options
| author | Andreas Huber <andih@google.com> | 2010-08-16 08:49:37 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-08-23 12:30:24 -0700 |
| commit | 5daeb129a2c2ba3d14ccd94af283b5f561c783ea (patch) | |
| tree | c3e0f59fefcdb20b92e9a2fc5da59a7cf4b1464f /media/libmedia/mediaplayer.cpp | |
| parent | a0ced19fa96f26a25de708588a34ebfd452f250e (diff) | |
| download | frameworks_av-5daeb129a2c2ba3d14ccd94af283b5f561c783ea.zip frameworks_av-5daeb129a2c2ba3d14ccd94af283b5f561c783ea.tar.gz frameworks_av-5daeb129a2c2ba3d14ccd94af283b5f561c783ea.tar.bz2 | |
Squashed commit of the following:
commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date: Mon Aug 16 08:48:42 2010 -0700
Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.
commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 13:56:44 2010 -0700
The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.
commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 09:34:35 2010 -0700
A first shot at supporting the new rendering APIs.
Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index f3229c0..32b20c7 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -206,10 +206,15 @@ status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface) LOGV("setVideoSurface"); Mutex::Autolock _l(mLock); if (mPlayer == 0) return NO_INIT; - if (surface != NULL) - return mPlayer->setVideoSurface(surface->getISurface()); - else - return mPlayer->setVideoSurface(NULL); + + status_t err = mPlayer->setVideoISurface( + surface == NULL ? NULL : surface->getISurface()); + + if (err != OK) { + return err; + } + + return mPlayer->setVideoSurface(surface); } // must call with lock held |