mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 11:36:00 +00:00
Merge "Revert "[Composer AIDL] Rename notifyExpectedPresentTimeoutNs and"" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
cb0d2eb323
@@ -42,7 +42,7 @@ parcelable VrrConfig {
|
||||
int averageRefreshPeriodNs;
|
||||
}
|
||||
parcelable NotifyExpectedPresentConfig {
|
||||
int headsUpNs;
|
||||
int timeoutNs;
|
||||
int notifyExpectedPresentHeadsUpNs;
|
||||
int notifyExpectedPresentTimeoutNs;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -895,9 +895,9 @@ interface IComposerClient {
|
||||
*
|
||||
* The framework will call this function based on the parameters specified in
|
||||
* DisplayConfiguration.VrrConfig:
|
||||
* - timeoutNs specifies the idle time from the previous present command
|
||||
* - notifyExpectedPresentTimeoutNs specifies the idle time from the previous present command
|
||||
* where the framework must send the early hint for the next frame.
|
||||
* - headsUpNs specifies minimal time that framework must send
|
||||
* - notifyExpectedPresentHeadsUpNs specifies minimal time that framework must send
|
||||
* the early hint before the next frame.
|
||||
*
|
||||
* The framework can omit calling this API when the next present command matches
|
||||
|
||||
@@ -45,7 +45,7 @@ parcelable VrrConfig {
|
||||
* The minimal time in nanoseconds that IComposerClient.notifyExpectedPresent needs to be
|
||||
* called ahead of an expectedPresentTime provided on a presentDisplay command.
|
||||
*/
|
||||
int headsUpNs;
|
||||
int notifyExpectedPresentHeadsUpNs;
|
||||
|
||||
/**
|
||||
* The time in nanoseconds that represents a timeout from the previous presentDisplay, which
|
||||
@@ -53,7 +53,7 @@ parcelable VrrConfig {
|
||||
* sending the next frame. If set to 0, there is no need to call
|
||||
* IComposerClient.notifyExpectedPresent for timeout.
|
||||
*/
|
||||
int timeoutNs;
|
||||
int notifyExpectedPresentTimeoutNs;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1274,8 +1274,8 @@ TEST_P(GraphicsComposerAidlV3Test, GetDisplayConfigurations) {
|
||||
if (vrrConfig.notifyExpectedPresentConfig) {
|
||||
const auto& notifyExpectedPresentConfig =
|
||||
*vrrConfig.notifyExpectedPresentConfig;
|
||||
EXPECT_GT(0, notifyExpectedPresentConfig.headsUpNs);
|
||||
EXPECT_GE(0, notifyExpectedPresentConfig.timeoutNs);
|
||||
EXPECT_GT(0, notifyExpectedPresentConfig.notifyExpectedPresentHeadsUpNs);
|
||||
EXPECT_GE(0, notifyExpectedPresentConfig.notifyExpectedPresentTimeoutNs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user