Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't reset the capture mode after each frame when using the CallbackAPI" into rvc-dev am: 5d3fc109ec am: 96803c27ad

Browse Source 
Change-Id: I9185f11695aad90d2ad5a37f5a6bdb849c31d808
This commit is contained in:
TreeHugger Robot
2020-04-07 17:26:54 +00:00
committed by Automerger Merge Worker
parent c57f78e34a 96803c27ad
commit 7bc7a10fc0
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/pipeline/skia/SkiaPipeline.cpp
View File

@@ -418,9 +418,9 @@ void SkiaPipeline::endCapture(SkSurface* surface) {
auto data = picture->serialize(); auto data = picture->serialize();
savePictureAsync(data, mCapturedFile); savePictureAsync(data, mCapturedFile);
mCaptureSequence = 0; mCaptureSequence = 0;
mCaptureMode = CaptureMode::None;
} }
} }
mCaptureMode = CaptureMode::None;
mRecorder.reset(); mRecorder.reset();
} }
} }

37
libs/hwui/tests/unit/SkiaPipelineTests.cpp
View File

@@ -403,3 +403,40 @@ RENDERTHREAD_SKIA_PIPELINE_TEST(SkiaPipeline, context_lost) {
renderThread.destroyRenderingContext(); renderThread.destroyRenderingContext();
EXPECT_FALSE(pipeline->isSurfaceReady()); EXPECT_FALSE(pipeline->isSurfaceReady());
} }
RENDERTHREAD_SKIA_PIPELINE_TEST(SkiaPipeline, pictureCallback) {
// create a pipeline and add a picture callback
auto pipeline = std::make_unique<SkiaOpenGLPipeline>(renderThread);
int callbackCount = 0;
pipeline->setPictureCapturedCallback(
[&callbackCount](sk_sp<SkPicture>&& picture) { callbackCount += 1; });
// create basic red frame and render it
auto redNode = TestUtils::createSkiaNode(
0, 0, 1, 1, [](RenderProperties& props, SkiaRecordingCanvas& redCanvas) {
redCanvas.drawColor(SK_ColorRED, SkBlendMode::kSrcOver);
});
LayerUpdateQueue layerUpdateQueue;
SkRect dirty = SkRectMakeLargest();
std::vector<sp<RenderNode>> renderNodes;
renderNodes.push_back(redNode);
bool opaque = true;
android::uirenderer::Rect contentDrawBounds(0, 0, 1, 1);
auto surface = SkSurface::MakeRasterN32Premul(1, 1);
pipeline->renderFrame(layerUpdateQueue, dirty, renderNodes, opaque, contentDrawBounds, surface,
SkMatrix::I());
// verify the callback was called
EXPECT_EQ(1, callbackCount);
// render a second frame and check the callback count
pipeline->renderFrame(layerUpdateQueue, dirty, renderNodes, opaque, contentDrawBounds, surface,
SkMatrix::I());
EXPECT_EQ(2, callbackCount);
// unset the callback, render another frame, check callback was not invoked
pipeline->setPictureCapturedCallback(nullptr);
pipeline->renderFrame(layerUpdateQueue, dirty, renderNodes, opaque, contentDrawBounds, surface,
SkMatrix::I());
EXPECT_EQ(2, callbackCount);
}