summaryrefslogtreecommitdiffstats
path: root/cmds/stagefright/stream.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-06-29 16:15:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-29 16:15:56 -0700
commit9906d2e28146b24fc516bfd2568caeb463944d96 (patch)
treefa8db6ece7efe4d5ba5cbee7b40ee6db0ec2e198 /cmds/stagefright/stream.cpp
parent4ea52aea75c385e8d9de8cc04554aa5d93ca272b (diff)
parent2df788fb0c402938f827bf9c9ce2ca3ab1dcd464 (diff)
downloadframeworks_av-9906d2e28146b24fc516bfd2568caeb463944d96.zip
frameworks_av-9906d2e28146b24fc516bfd2568caeb463944d96.tar.gz
frameworks_av-9906d2e28146b24fc516bfd2568caeb463944d96.tar.bz2
Merge "SF transactions are now O(1) wrt IPC instead of O(N)."
Diffstat (limited to 'cmds/stagefright/stream.cpp')
-rw-r--r--cmds/stagefright/stream.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/stagefright/stream.cpp b/cmds/stagefright/stream.cpp
index 41ccd91..ee91c29 100644
--- a/cmds/stagefright/stream.cpp
+++ b/cmds/stagefright/stream.cpp
@@ -305,10 +305,10 @@ int main(int argc, char **argv) {
CHECK(control != NULL);
CHECK(control->isValid());
- CHECK_EQ(composerClient->openTransaction(), (status_t)OK);
+ SurfaceComposerClient::openGlobalTransaction();
CHECK_EQ(control->setLayer(30000), (status_t)OK);
CHECK_EQ(control->show(), (status_t)OK);
- CHECK_EQ(composerClient->closeTransaction(), (status_t)OK);
+ SurfaceComposerClient::closeGlobalTransaction();
sp<Surface> surface = control->getSurface();
CHECK(surface != NULL);