summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-08-22 15:35:28 -0700
committerChong Zhang <chz@google.com>2014-08-22 15:42:49 -0700
commit13d6faa02087ce3bb0d4a02b8495f1822f211433 (patch)
tree37cb5be49ca1a1d89433c98d512d7469d0d2e82a /media/libmediaplayerservice/nuplayer/NuPlayer.cpp
parentd1de9bb33a2f645fb9dc54e7fc69ca45304850a5 (diff)
downloadframeworks_av-13d6faa02087ce3bb0d4a02b8495f1822f211433.zip
frameworks_av-13d6faa02087ce3bb0d4a02b8495f1822f211433.tar.gz
frameworks_av-13d6faa02087ce3bb0d4a02b8495f1822f211433.tar.bz2
wait for flush to finish before returning setSurface
Bug: 17187598 Change-Id: I091219e57158a4532044ca49342b57277d6ecb15
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0a9b65c..3dbc0a2 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1732,6 +1732,13 @@ void NuPlayer::performSetSurface(const sp<NativeWindowWrapper> &wrapper) {
// XXX - ignore error from setVideoScalingMode for now
setVideoScalingMode(mVideoScalingMode);
+
+ if (mDriver != NULL) {
+ sp<NuPlayerDriver> driver = mDriver.promote();
+ if (driver != NULL) {
+ driver->notifySetSurfaceComplete();
+ }
+ }
}
void NuPlayer::onSourceNotify(const sp<AMessage> &msg) {