diff options
| author | Mathias Agopian <mathias@google.com> | 2011-06-29 16:15:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-29 16:15:56 -0700 |
| commit | 9906d2e28146b24fc516bfd2568caeb463944d96 (patch) | |
| tree | fa8db6ece7efe4d5ba5cbee7b40ee6db0ec2e198 | |
| parent | 4ea52aea75c385e8d9de8cc04554aa5d93ca272b (diff) | |
| parent | 2df788fb0c402938f827bf9c9ce2ca3ab1dcd464 (diff) | |
| download | frameworks_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)."
| -rw-r--r-- | cmds/stagefright/sf2.cpp | 4 | ||||
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 4 | ||||
| -rw-r--r-- | cmds/stagefright/stream.cpp | 4 | ||||
| -rw-r--r-- | include/private/surfaceflinger/LayerState.h | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/cmds/stagefright/sf2.cpp b/cmds/stagefright/sf2.cpp index ddd64ec..6fa66cf 100644 --- a/cmds/stagefright/sf2.cpp +++ b/cmds/stagefright/sf2.cpp @@ -568,10 +568,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(); surface = control->getSurface(); CHECK(surface != NULL); diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 656f5fd..1a5b7f3 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -865,10 +865,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(); gSurface = control->getSurface(); CHECK(gSurface != NULL); 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); diff --git a/include/private/surfaceflinger/LayerState.h b/include/private/surfaceflinger/LayerState.h index d7fe572..d2fed41 100644 --- a/include/private/surfaceflinger/LayerState.h +++ b/include/private/surfaceflinger/LayerState.h @@ -29,6 +29,7 @@ namespace android { class Parcel; +class ISurfaceComposerClient; struct layer_state_t { @@ -68,6 +69,13 @@ struct layer_state_t { Region transparentRegion; }; +struct ComposerState { + sp<ISurfaceComposerClient> client; + layer_state_t state; + status_t write(Parcel& output) const; + status_t read(const Parcel& input); +}; + }; // namespace android #endif // ANDROID_SF_LAYER_STATE_H |