summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-08-26 15:24:43 -0700
committerWei Jia <wjia@google.com>2014-08-26 15:24:43 -0700
commit9c03a40367c149526c31ddf14a518ba2036195a5 (patch)
tree2bf273ee7aeefbcb2b62925478e311b45b660309 /media/libmediaplayerservice
parentd42173a44721af1a600b9c8599bc736394fcc724 (diff)
downloadframeworks_av-9c03a40367c149526c31ddf14a518ba2036195a5.zip
frameworks_av-9c03a40367c149526c31ddf14a518ba2036195a5.tar.gz
frameworks_av-9c03a40367c149526c31ddf14a518ba2036195a5.tar.bz2
NuPlayer: set controlledByApp to true when creating Surface.
This fixes hang when trying to dequeue buffer from native window followed by a flush. Bug: 16303659 Bug: 17250931 Change-Id: Ib87ae558b020f5ce82b4192ec63339c93a72a2e9
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index f4cd02c..2b7457b 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -280,7 +280,7 @@ void NuPlayer::setVideoSurfaceTextureAsync(
msg->setObject(
"native-window",
new NativeWindowWrapper(
- new Surface(bufferProducer)));
+ new Surface(bufferProducer, true /* controlledByApp */)));
}
msg->post();