Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reland fix wrong VSYNC event #37865

Merged
iskakaushik merged 12 commits into from
Dec 7, 2022
Merged

Reland fix wrong VSYNC event #37865

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7dc4709
impl
fzyzcjy Nov 23, 2022
69f99c1
fix
fzyzcjy Nov 23, 2022
3856bb5
minor
fzyzcjy Nov 23, 2022
2f0f3d3
fix
fzyzcjy Nov 23, 2022
4e08e44
fix
fzyzcjy Nov 23, 2022
7abcdec
bump ci
fzyzcjy Nov 23, 2022
58154a2
Merge branch 'flutter:main' into feat/reland-vsync-fix
fzyzcjy Dec 6, 2022
2412cb6
rename
fzyzcjy Dec 6, 2022
02fa9b6
rename++
fzyzcjy Dec 6, 2022
a11c772
add macro
fzyzcjy Dec 7, 2022
e66ce59
fix
fzyzcjy Dec 7, 2022
e422b61
fix
fzyzcjy Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions shell/common/vsync_waiter_fallback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,20 @@ VsyncWaiterFallback::~VsyncWaiterFallback() = default;

// |VsyncWaiter|
void VsyncWaiterFallback::AwaitVSync() {
TRACE_EVENT0("flutter", "VSYNC");

constexpr fml::TimeDelta kSingleFrameInterval =
fml::TimeDelta::FromSecondsF(1.0 / 60.0);
auto frame_start_time =
SnapToNextTick(fml::TimePoint::Now(), phase_, kSingleFrameInterval);
auto frame_target_time = frame_start_time + kSingleFrameInterval;

const std::string start_time_str =
std::to_string(frame_start_time.ToEpochDelta().ToMicroseconds());
const std::string frame_target_time_str =
std::to_string(frame_target_time.ToEpochDelta().ToMicroseconds());
TRACE_EVENT2("flutter", "VsyncAlike", "frame_start_time",
Comment thread
fzyzcjy marked this conversation as resolved.
Outdated
start_time_str.c_str(), "frame_target_time",
frame_target_time_str.c_str());

std::weak_ptr<VsyncWaiterFallback> weak_this =
std::static_pointer_cast<VsyncWaiterFallback>(shared_from_this());

Expand Down
21 changes: 17 additions & 4 deletions shell/platform/android/vsync_waiter_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ void VsyncWaiterAndroid::AwaitVSync() {

// static
void VsyncWaiterAndroid::OnVsyncFromNDK(int64_t frame_nanos, void* data) {
TRACE_EVENT0("flutter", "VSYNC");

auto frame_time = fml::TimePoint::FromEpochDelta(
fml::TimeDelta::FromNanoseconds(frame_nanos));
auto now = fml::TimePoint::Now();
Expand All @@ -62,6 +60,15 @@ void VsyncWaiterAndroid::OnVsyncFromNDK(int64_t frame_nanos, void* data) {
}
auto target_time = frame_time + fml::TimeDelta::FromNanoseconds(
1000000000.0 / g_refresh_rate_);

const std::string frame_start_time_str =
std::to_string(frame_time.ToEpochDelta().ToMicroseconds());
const std::string frame_target_time_str =
std::to_string(target_time.ToEpochDelta().ToMicroseconds());
TRACE_EVENT2("flutter", "VsyncAlike", "frame_start_time",
frame_start_time_str.c_str(), "frame_target_time",
frame_target_time_str.c_str());

auto* weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(data);
ConsumePendingCallback(weak_this, frame_time, target_time);
}
Expand All @@ -72,13 +79,19 @@ void VsyncWaiterAndroid::OnVsyncFromJava(JNIEnv* env,
jlong frameDelayNanos,
jlong refreshPeriodNanos,
jlong java_baton) {
TRACE_EVENT0("flutter", "VSYNC");

auto frame_time =
fml::TimePoint::Now() - fml::TimeDelta::FromNanoseconds(frameDelayNanos);
auto target_time =
frame_time + fml::TimeDelta::FromNanoseconds(refreshPeriodNanos);

const std::string frame_start_time_str =
std::to_string(frame_time.ToEpochDelta().ToMicroseconds());
const std::string frame_target_time_str =
std::to_string(target_time.ToEpochDelta().ToMicroseconds());
TRACE_EVENT2("flutter", "VsyncAlike", "frame_start_time",
Comment thread
fzyzcjy marked this conversation as resolved.
Outdated
frame_start_time_str.c_str(), "frame_target_time",
frame_target_time_str.c_str());

auto* weak_this = reinterpret_cast<std::weak_ptr<VsyncWaiter>*>(java_baton);
ConsumePendingCallback(weak_this, frame_time, target_time);
}
Expand Down
9 changes: 7 additions & 2 deletions shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,19 @@ - (void)pause {
}

- (void)onDisplayLink:(CADisplayLink*)link {
TRACE_EVENT0("flutter", "VSYNC");

CFTimeInterval delay = CACurrentMediaTime() - link.timestamp;
fml::TimePoint frame_start_time = fml::TimePoint::Now() - fml::TimeDelta::FromSecondsF(delay);

CFTimeInterval duration = link.targetTimestamp - link.timestamp;
fml::TimePoint frame_target_time = frame_start_time + fml::TimeDelta::FromSecondsF(duration);

const std::string frame_start_time_str =
std::to_string(frame_start_time.ToEpochDelta().ToMicroseconds());
const std::string frame_target_time_str =
std::to_string(frame_target_time.ToEpochDelta().ToMicroseconds());
TRACE_EVENT2("flutter", "VsyncAlike", "frame_start_time", frame_start_time_str.c_str(),
"frame_target_time", frame_target_time_str.c_str());

std::unique_ptr<flutter::FrameTimingsRecorder> recorder =
std::make_unique<flutter::FrameTimingsRecorder>();

Expand Down