openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-27 01:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!17442 VSYNC状态切换

Browse Source 
Merge pull request !17442 from XUXIAOBO/master1125
This commit is contained in:
openharmony_ci 2024-11-25 13:23:01 +00:00 committed by Gitee
commit 99b43f902f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rosen/modules/composer/vsync/include/vsync_distributor.h
View File

@ -141,6 +141,7 @@ public:
int64_t GetVsyncCount();
uint64_t GetRealTimeOffsetOfDvsync(int64_t time);
VsyncError SetNativeDVSyncSwitch(bool dvsyncSwitch, const sptr<VSyncConnection> &connection);
void SetHasNativeBuffer();
private:
@ -180,6 +181,8 @@ private:
void CheckNeedDisableDvsync(int64_t now, int64_t period);
void OnVSyncTrigger(int64_t now, int64_t period,
uint32_t refreshRate, VSyncMode vsyncMode, uint32_t vsyncMaxRefreshRate);
void OnVSyncTriggerPostEvent(int64_t now, uint32_t generatorRefreshRate,
std::vector<sptr<VSyncConnection>>& conns, int64_t period, int64_t vsyncCount);
sptr<VSyncSystemAbilityListener> saStatusChangeListener_ = nullptr;
std::thread threadLoop_;

34
rosen/modules/composer/vsync/src/vsync_distributor.cpp
View File

@ -634,7 +634,11 @@ void VSyncDistributor::OnVSyncTrigger(int64_t now, int64_t period,
std::lock_guard<std::mutex> locker(mutex_);
event_.vsyncCount++;
vsyncCount = event_.vsyncCount;
#if defined(RS_ENABLE_DVSYNC)
if (dvsync_->IsFeatureEnabled()) {
dvsync_->RecordVSync(now, period, refreshRate);
}
#endif
if (refreshRate > 0) {
event_.vsyncPulseCount += static_cast<int64_t>(vsyncMaxRefreshRate / refreshRate);
generatorRefreshRate_ = refreshRate;
@ -656,8 +660,18 @@ void VSyncDistributor::OnVSyncTrigger(int64_t now, int64_t period,
CountTrace(HITRACE_TAG_GRAPHIC_AGP, "VSync-" + name_, countTraceValue_);
generatorRefreshRate = generatorRefreshRate_;
#if defined(RS_ENABLE_DVSYNC)
if (dvsync_->IsFeatureEnabled()) {
dvsync_->RecordPostEvent(conns, now);
}
#endif
}
OnVSyncTriggerPostEvent(now, generatorRefreshRate, conns, period, vsyncCount);
}
void VSyncDistributor::OnVSyncTriggerPostEvent(int64_t now, uint32_t generatorRefreshRate,
std::vector<sptr<VSyncConnection>>& conns, int64_t period, int64_t vsyncCount)
{
for (uint32_t i = 0; i < conns.size(); i++) {
int64_t actualPeriod = period;
if ((generatorRefreshRate > 0) && (conns[i]->refreshRate_ > 0) &&
@ -685,7 +699,13 @@ void VSyncDistributor::OnVSyncEvent(int64_t now, int64_t period,
uint32_t refreshRate, VSyncMode vsyncMode, uint32_t vsyncMaxRefreshRate)
{
#if defined(RS_ENABLE_DVSYNC)
bool needDVSyncTrigger = true;
if (dvsync_->IsFeatureEnabled()) {
std::unique_lock<std::mutex> locker(mutex_);
dvsync_->ChangeState(now);
needDVSyncTrigger = dvsync_->NeedDVSyncTrigger();
}
if (dvsync_->IsFeatureEnabled() && needDVSyncTrigger) {
OnDVSyncTrigger(now, period, refreshRate, vsyncMode, vsyncMaxRefreshRate);
} else
#endif
@ -926,7 +946,7 @@ VsyncError VSyncDistributor::RequestNextVSync(const sptr<VSyncConnection> &conne
std::unique_lock<std::mutex> locker(mutex_);
#if defined(RS_ENABLE_DVSYNC)
if (IsDVsyncOn() && isRs_) {
if (IsDVsyncOn() && isRs_ && dvsync_->NeedDVSyncRNV()) {
dvsync_->RNVWait(locker);
}
#endif
@ -954,7 +974,7 @@ VsyncError VSyncDistributor::RequestNextVSync(const sptr<VSyncConnection> &conne
connection->triggerThisTime_ = true;
#if defined(RS_ENABLE_DVSYNC)
hasVsync_.store(true);
if (dvsync_->IsFeatureEnabled()) {
if (dvsync_->IsFeatureEnabled() && dvsync_->NeedDVSyncRNV()) {
con_.notify_all();
} else
#endif
@ -1278,5 +1298,13 @@ int64_t VSyncDistributor::GetVsyncCount()
std::unique_lock<std::mutex> locker(mutex_);
return event_.vsyncCount;
}
void VSyncDistributor::SetHasNativeBuffer()
{
#if defined(RS_ENABLE_DVSYNC)
std::unique_lock<std::mutex> locker(mutex_);
dvsync_->SetHasNativeBuffer();
#endif
}
}
}

3
rosen/modules/render_service/core/pipeline/rs_main_thread.cpp
View File

@ -1422,6 +1422,9 @@ void RSMainThread::ConsumeAndUpdateAllNodes()
}
auto surfaceHandler = surfaceNode->GetMutableRSSurfaceHandler();
if (surfaceHandler->GetAvailableBufferCount() > 0) {
if (rsVSyncDistributor_ != nullptr) {
rsVSyncDistributor_->SetHasNativeBuffer();
}
auto name = surfaceNode->GetName().empty() ? DEFAULT_SURFACE_NODE_NAME : surfaceNode->GetName();
auto frameRateMgr = HgmCore::Instance().GetFrameRateMgr();
if (frameRateMgr != nullptr) {