diff options
| author | Andreas Huber <andih@google.com> | 2010-02-08 16:39:24 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-08 16:39:24 -0800 |
| commit | 2dd73b65542c9eeb82bb567098f235349d18b06f (patch) | |
| tree | 6d473e627e5c8f78f7380db7b550d7f3d932f66b /media/libmediaplayerservice | |
| parent | 940ad815a1a30abf0268949e3d3937d7e0d672c0 (diff) | |
| parent | c23f12af0394aa2f6651968a3c8840f1af317aa1 (diff) | |
| download | frameworks_av-2dd73b65542c9eeb82bb567098f235349d18b06f.zip frameworks_av-2dd73b65542c9eeb82bb567098f235349d18b06f.tar.gz frameworks_av-2dd73b65542c9eeb82bb567098f235349d18b06f.tar.bz2 | |
Merge "Properly implement asynchronous preparation of media playback."
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index f42d55b..1bfcf65 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.cpp +++ b/media/libmediaplayerservice/StagefrightPlayer.cpp @@ -49,30 +49,11 @@ status_t StagefrightPlayer::setVideoSurface(const sp<ISurface> &surface) { } status_t StagefrightPlayer::prepare() { - LOGV("prepare"); - - int32_t width, height; - if (mPlayer->getVideoDimensions(&width, &height) != OK) { - width = height = 0; - } - - sendEvent(MEDIA_SET_VIDEO_SIZE, width, height); - - return OK; + return mPlayer->prepare(); } status_t StagefrightPlayer::prepareAsync() { - LOGV("prepareAsync"); - - status_t err = prepare(); - - if (err != OK) { - return err; - } - - sendEvent(MEDIA_PREPARED); - - return OK; + return mPlayer->prepareAsync(); } status_t StagefrightPlayer::start() { |