diff options
| author | Robert Carr <racarr@google.com> | 2017-08-31 15:58:36 -0700 |
|---|---|---|
| committer | Robert Carr <racarr@google.com> | 2017-10-11 16:00:14 -0700 |
| commit | 116c7922f7d595fe0ad9d8a6a313ee206c0117f5 (patch) | |
| tree | 3012665abc303919ff447a5695f712653b7155eb /media | |
| parent | 7de1920b41a7c5a6aa466dcd4fffc936193328b1 (diff) | |
| download | android_frameworks_av-116c7922f7d595fe0ad9d8a6a313ee206c0117f5.tar.gz android_frameworks_av-116c7922f7d595fe0ad9d8a6a313ee206c0117f5.tar.bz2 android_frameworks_av-116c7922f7d595fe0ad9d8a6a313ee206c0117f5.zip | |
Track libgui changes
New SurfaceFlinger API.
Test: Boots
Change-Id: Icdc53535664fef32ebc937eb2283e96abdefbbc1
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/cmds/codec2.cpp | 8 | ||||
| -rw-r--r-- | media/libstagefright/tests/SurfaceMediaSource_test.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/media/libstagefright/codecs/cmds/codec2.cpp b/media/libstagefright/codecs/cmds/codec2.cpp index ad4da9b977..f64887d74b 100644 --- a/media/libstagefright/codecs/cmds/codec2.cpp +++ b/media/libstagefright/codecs/cmds/codec2.cpp @@ -154,10 +154,10 @@ SimplePlayer::SimplePlayer() CHECK(mControl != NULL); CHECK(mControl->isValid()); - SurfaceComposerClient::openGlobalTransaction(); - CHECK_EQ(mControl->setLayer(INT_MAX), (status_t)OK); - CHECK_EQ(mControl->show(), (status_t)OK); - SurfaceComposerClient::closeGlobalTransaction(); + SurfaceComposerClient::Transaction{} + .setLayer(mControl, INT_MAX) + .show(mControl) + .apply(); mSurface = mControl->getSurface(); CHECK(mSurface != NULL); diff --git a/media/libstagefright/tests/SurfaceMediaSource_test.cpp b/media/libstagefright/tests/SurfaceMediaSource_test.cpp index 7c464ff842..051108f335 100644 --- a/media/libstagefright/tests/SurfaceMediaSource_test.cpp +++ b/media/libstagefright/tests/SurfaceMediaSource_test.cpp @@ -94,10 +94,10 @@ protected: ASSERT_TRUE(mSurfaceControl != NULL); ASSERT_TRUE(mSurfaceControl->isValid()); - SurfaceComposerClient::openGlobalTransaction(); - ASSERT_EQ(NO_ERROR, mSurfaceControl->setLayer(0x7FFFFFFF)); - ASSERT_EQ(NO_ERROR, mSurfaceControl->show()); - SurfaceComposerClient::closeGlobalTransaction(); + SurfaceComposerClient::Transaction{} + .setLayer(mSurfaceControl, 0x7FFFFFFF) + .show(mSurfaceControl) + .apply(); sp<ANativeWindow> window = mSurfaceControl->getSurface(); mEglSurface = eglCreateWindowSurface(mEglDisplay, mGlConfig, |