gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Track libgui changes"

Browse Source
gugelfrei
Rob Carr 7 years ago committed by Android (Google) Code Review
parent 49e4421c9b 116c7922f7
commit bf44f4ec30
10 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File

8
camera/tests/CameraZSLTests.cpp
Unescape View File

@ -256,10 +256,10 @@ TEST_F(CameraZSLTests, TestAllPictureSizes) {
ASSERT_TRUE(nullptr != surfaceControl.get());
ASSERT_TRUE(surfaceControl->isValid());
SurfaceComposerClient::openGlobalTransaction();
ASSERT_EQ(NO_ERROR, surfaceControl->setLayer(0x7fffffff));
ASSERT_EQ(NO_ERROR, surfaceControl->show());
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction{}
.setLayer(surfaceControl, 0x7fffffff)
.show(surfaceControl)
.apply();
previewSurface = surfaceControl->getSurface();
ASSERT_TRUE(previewSurface != NULL);

2
cmds/screenrecord/Android.mk
Unescape View File

@ -26,7 +26,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := \
libstagefright libmedia libutils libbinder libstagefright_foundation \
libjpeg libgui libcutils liblog libEGL libGLESv2
libjpeg libui libgui libcutils liblog libEGL libGLESv2
LOCAL_C_INCLUDES := \
frameworks/av/media/libstagefright \

22
cmds/screenrecord/screenrecord.cpp
Unescape View File

@ -213,7 +213,9 @@ static status_t prepareEncoder(float displayFps, sp<MediaCodec>* pCodec,
* Sets the display projection, based on the display dimensions, video size,
* and device orientation.
*/
static status_t setDisplayProjection(const sp<IBinder>& dpy,
static status_t setDisplayProjection(
SurfaceComposerClient::Transaction& t,
const sp<IBinder>& dpy,
const DisplayInfo& mainDpyInfo) {
// Set the region of the layer stack we're interested in, which in our
@ -279,7 +281,7 @@ static status_t setDisplayProjection(const sp<IBinder>& dpy,
}
}
SurfaceComposerClient::setDisplayProjection(dpy,
t.setDisplayProjection(dpy,
gRotate ? DISPLAY_ORIENTATION_90 : DISPLAY_ORIENTATION_0,
layerStackRect, displayRect);
return NO_ERROR;
@ -295,11 +297,11 @@ static status_t prepareVirtualDisplay(const DisplayInfo& mainDpyInfo,
sp<IBinder> dpy = SurfaceComposerClient::createDisplay(
String8("ScreenRecorder"), false /*secure*/);
SurfaceComposerClient::openGlobalTransaction();
SurfaceComposerClient::setDisplaySurface(dpy, bufferProducer);
setDisplayProjection(dpy, mainDpyInfo);
SurfaceComposerClient::setDisplayLayerStack(dpy, 0); // default stack
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction t;
t.setDisplaySurface(dpy, bufferProducer);
setDisplayProjection(t, dpy, mainDpyInfo);
t.setDisplayLayerStack(dpy, 0); // default stack
t.apply();
*pDisplayHandle = dpy;
@ -379,9 +381,9 @@ static status_t runEncoder(const sp<MediaCodec>& encoder,
ALOGW("getDisplayInfo(main) failed: %d", err);
} else if (orientation != mainDpyInfo.orientation) {
ALOGD("orientation changed, now %d", mainDpyInfo.orientation);
SurfaceComposerClient::openGlobalTransaction();
setDisplayProjection(virtualDpy, mainDpyInfo);
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction t;
setDisplayProjection(t, virtualDpy, mainDpyInfo);
t.apply();
orientation = mainDpyInfo.orientation;
}
}

7
cmds/stagefright/Android.mk
Unescape View File

@ -9,7 +9,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libstagefright libmedia libutils libbinder libstagefright_foundation \
libjpeg libgui libcutils liblog \
libjpeg libui libgui libcutils liblog \
libhidlmemory \
android.hardware.media.omx@1.0 \
@ -107,7 +107,7 @@ LOCAL_SRC_FILES:= \
stream.cpp \
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libgui \
libstagefright liblog libutils libbinder libui libgui \
libstagefright_foundation libmedia libcutils
LOCAL_C_INCLUDES:= \
@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder libstagefright_foundation \
libmedia libaudioclient libgui libcutils
libmedia libaudioclient libui libgui libcutils
LOCAL_C_INCLUDES:= \
frameworks/av/media/libstagefright \
@ -163,6 +163,7 @@ LOCAL_SHARED_LIBRARIES := \
libbinder \
libstagefright_foundation \
libmedia \
libui \
libgui \
libcutils \
libRScpp \

8
cmds/stagefright/codec.cpp
Unescape View File

@ -430,10 +430,10 @@ int main(int argc, char **argv) {
CHECK(control != NULL);
CHECK(control->isValid());
SurfaceComposerClient::openGlobalTransaction();
CHECK_EQ(control->setLayer(INT_MAX), (status_t)OK);
CHECK_EQ(control->show(), (status_t)OK);
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction{}
.setLayer(control, INT_MAX)
.show(control)
.apply();
surface = control->getSurface();
CHECK(surface != NULL);

8
cmds/stagefright/mediafilter.cpp
Unescape View File

@ -764,10 +764,10 @@ int main(int argc, char **argv) {
CHECK(control != NULL);
CHECK(control->isValid());
SurfaceComposerClient::openGlobalTransaction();
CHECK_EQ((status_t)OK, control->setLayer(INT_MAX));
CHECK_EQ((status_t)OK, control->show());
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction{}
.setLayer(control, INT_MAX)
.show(control)
.apply();
surface = control->getSurface();
CHECK(surface != NULL);

8
cmds/stagefright/stagefright.cpp
Unescape View File

@ -960,10 +960,10 @@ int main(int argc, char **argv) {
CHECK(control != NULL);
CHECK(control->isValid());
SurfaceComposerClient::openGlobalTransaction();
CHECK_EQ(control->setLayer(INT_MAX), (status_t)OK);
CHECK_EQ(control->show(), (status_t)OK);
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction{}
.setLayer(control, INT_MAX)
.show(control)
.apply();
gSurface = control->getSurface();
CHECK(gSurface != NULL);

8
cmds/stagefright/stream.cpp
Unescape View File

@ -335,10 +335,10 @@ int main(int argc, char **argv) {
CHECK(control != NULL);
CHECK(control->isValid());
SurfaceComposerClient::openGlobalTransaction();
CHECK_EQ(control->setLayer(INT_MAX), (status_t)OK);
CHECK_EQ(control->show(), (status_t)OK);
SurfaceComposerClient::closeGlobalTransaction();
SurfaceComposerClient::Transaction{}
.setLayer(control, INT_MAX)
.show(control)
.apply();
sp<Surface> surface = control->getSurface();
CHECK(surface != NULL);

8
media/libstagefright/codecs/cmds/codec2.cpp
Unescape View File

@ -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);

8
media/libstagefright/tests/SurfaceMediaSource_test.cpp
Unescape View File

@ -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,

Write Preview
Loading…
Cancel
Save