Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

composer: 2.4: fix VTS usage of desired time am: 30d2573834 am: b672893691 am: 30261db626

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12171999

Change-Id: Ie7bad4e281d1f6969041013825cd50659e3cad0a
This commit is contained in:
Ady Abraham
2020-07-16 21:54:19 +00:00
committed by Automerger Merge Worker
parent e467bced01 30261db626
commit 81650b5cb7
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp
View File

@@ -201,8 +201,12 @@ class GraphicsComposerHidlCommandTest : public GraphicsComposerHidlTest {
void execute() { mComposerClient->execute(mReader.get(), mWriter.get()); } void execute() { mComposerClient->execute(mReader.get(), mWriter.get()); }
void Test_setActiveConfigWithConstraints( struct TestParameters {
const IComposerClient::VsyncPeriodChangeConstraints& constraints, bool refreshMiss); nsecs_t delayForChange;
bool refreshMiss;
};
void Test_setActiveConfigWithConstraints(const TestParameters& params);
void sendRefreshFrame(const VsyncPeriodChangeTimeline*); void sendRefreshFrame(const VsyncPeriodChangeTimeline*);
@@ -453,9 +457,7 @@ void GraphicsComposerHidlCommandTest::waitForVsyncPeriodChange(
} }
void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints( void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints(
const IComposerClient::VsyncPeriodChangeConstraints& constraints, bool refreshMiss) { const TestParameters& params) {
VsyncPeriodChangeTimeline timeline = {};
for (Display display : mComposerCallback->getDisplays()) { for (Display display : mComposerCallback->getDisplays()) {
forEachTwoConfigs(display, [&](Config config1, Config config2) { forEachTwoConfigs(display, [&](Config config1, Config config2) {
mComposerClient->setActiveConfig(display, config1); mComposerClient->setActiveConfig(display, config1);
@@ -470,6 +472,10 @@ void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints(
return; // continue return; // continue
} }
VsyncPeriodChangeTimeline timeline;
IComposerClient::VsyncPeriodChangeConstraints constraints = {
.desiredTimeNanos = systemTime() + params.delayForChange,
.seamlessRequired = false};
EXPECT_EQ(Error::NONE, mComposerClient->setActiveConfigWithConstraints( EXPECT_EQ(Error::NONE, mComposerClient->setActiveConfigWithConstraints(
display, config2, constraints, &timeline)); display, config2, constraints, &timeline));
@@ -480,7 +486,7 @@ void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints(
kReasonableTimeForChange.count()); kReasonableTimeForChange.count());
if (timeline.refreshRequired) { if (timeline.refreshRequired) {
if (refreshMiss) { if (params.refreshMiss) {
// Miss the refresh frame on purpose to make sure the implementation sends a // Miss the refresh frame on purpose to make sure the implementation sends a
// callback // callback
std::this_thread::sleep_until(toTimePoint(timeline.refreshTimeNanos) + 100ms); std::this_thread::sleep_until(toTimePoint(timeline.refreshTimeNanos) + 100ms);
@@ -494,7 +500,7 @@ void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints(
// cases the implementation might have missed the deadline. In this case a new // cases the implementation might have missed the deadline. In this case a new
// timeline should have been provided. // timeline should have been provided.
auto newTimeline = mComposerCallback->takeLastVsyncPeriodChangeTimeline(); auto newTimeline = mComposerCallback->takeLastVsyncPeriodChangeTimeline();
if (timeline.refreshRequired && refreshMiss) { if (timeline.refreshRequired && params.refreshMiss) {
EXPECT_TRUE(newTimeline.has_value()); EXPECT_TRUE(newTimeline.has_value());
} }
@@ -515,28 +521,16 @@ void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints(
} }
TEST_P(GraphicsComposerHidlCommandTest, setActiveConfigWithConstraints) { TEST_P(GraphicsComposerHidlCommandTest, setActiveConfigWithConstraints) {
IComposerClient::VsyncPeriodChangeConstraints constraints; Test_setActiveConfigWithConstraints({.delayForChange = 0, .refreshMiss = false});
constraints.seamlessRequired = false;
constraints.desiredTimeNanos = systemTime();
Test_setActiveConfigWithConstraints(constraints, false);
} }
TEST_P(GraphicsComposerHidlCommandTest, setActiveConfigWithConstraints_Delayed) { TEST_P(GraphicsComposerHidlCommandTest, setActiveConfigWithConstraints_Delayed) {
IComposerClient::VsyncPeriodChangeConstraints constraints; Test_setActiveConfigWithConstraints({.delayForChange = 300'000'000, // 300ms
.refreshMiss = false});
constexpr nsecs_t kDelayForChange = 300'000'000; // 300ms
constraints.seamlessRequired = false;
constraints.desiredTimeNanos = systemTime() + kDelayForChange;
Test_setActiveConfigWithConstraints(constraints, false);
} }
TEST_P(GraphicsComposerHidlCommandTest, setActiveConfigWithConstraints_MissRefresh) { TEST_P(GraphicsComposerHidlCommandTest, setActiveConfigWithConstraints_MissRefresh) {
IComposerClient::VsyncPeriodChangeConstraints constraints; Test_setActiveConfigWithConstraints({.delayForChange = 0, .refreshMiss = true});
constraints.seamlessRequired = false;
constraints.desiredTimeNanos = systemTime();
Test_setActiveConfigWithConstraints(constraints, true);
} }
TEST_P(GraphicsComposerHidlTest, setAutoLowLatencyModeBadDisplay) { TEST_P(GraphicsComposerHidlTest, setAutoLowLatencyModeBadDisplay) {