summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/StagefrightPlayer.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-02-08 14:40:30 -0800
committerAndreas Huber <andih@google.com>2010-02-08 16:23:47 -0800
commitc23f12af0394aa2f6651968a3c8840f1af317aa1 (patch)
tree7a47a6b8aa092410a706328c644e5e08ad901109 /media/libmediaplayerservice/StagefrightPlayer.cpp
parentc9c4bef6b7f6793263a1f7659fe3641e856f2573 (diff)
downloadframeworks_av-c23f12af0394aa2f6651968a3c8840f1af317aa1.zip
frameworks_av-c23f12af0394aa2f6651968a3c8840f1af317aa1.tar.gz
frameworks_av-c23f12af0394aa2f6651968a3c8840f1af317aa1.tar.bz2
Properly implement asynchronous preparation of media playback.
related-to-bug: 2413002
Diffstat (limited to 'media/libmediaplayerservice/StagefrightPlayer.cpp')
-rw-r--r--media/libmediaplayerservice/StagefrightPlayer.cpp23
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() {