openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2025-01-01 12:20:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!571 修复Composer相关issue

Browse Source 
Merge pull request !571 from Andrew0229/fixcodesytle
This commit is contained in:
openharmony_ci 2022-03-03 08:01:27 +00:00 committed by Gitee
commit f5b827217c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/surface/src/buffer_queue.cpp
View File

@ -507,10 +507,6 @@ GSError BufferQueue::AllocBuffer(sptr<SurfaceBufferImpl> &buffer,
return ret;
}
if (buffer == nullptr) {
BLOGN_FAILURE_ID_RET(sequence, GSERROR_INVALID_ARGUMENTS);
}
BufferElement ele = {
.buffer = buffer,
.state = BUFFER_STATE_REQUESTED,

2
frameworks/surfaceimage/include/surface_image.h
View File

@ -59,7 +59,7 @@ public:
SurfaceError SetDefaultSize(int32_t width, int32_t height);
SurfaceError UpdateSurfaceImage();
uint64_t GetTimeStamp();
int64_t GetTimeStamp();
// update buffer available state, updateSurfaceImage_ and a private mutex
void OnUpdateBufferAvailableState(bool updated)

2
frameworks/surfaceimage/src/surface_image.cpp
View File

@ -201,7 +201,7 @@ SurfaceError SurfaceImage::DetachContext()
return SURFACE_ERROR_OK;
}
uint64_t SurfaceImage::GetTimeStamp()
int64_t SurfaceImage::GetTimeStamp()
{
std::lock_guard<std::mutex> lockGuard(opMutex_);
return currentTimeStamp_;

6
rosen/modules/composer/hdi_backend/src/hdi_layer.cpp
View File

@ -325,9 +325,9 @@ void HdiLayer::CheckRet(int32_t ret, const char* func)
void HdiLayer::Dump(std::string &result)
{
const int offset = count;
for (int i = 0; i < FRAME_RECORDS_NUM; i++) {
int order = (offset + i) % FRAME_RECORDS_NUM;
const uint32_t offset = count;
for (uint32_t i = 0; i < FRAME_RECORDS_NUM; i++) {
uint32_t order = (offset + i) % FRAME_RECORDS_NUM;
if (presentTimeRecords[order].presentFence != SyncFence::INVALID_FENCE) {
presentTimeRecords[order].presentTime = presentTimeRecords[order].presentFence->SyncFileReadTimestamp();
presentTimeRecords[order].presentFence = SyncFence::INVALID_FENCE;

1
rosen/modules/render_service_base/src/platform/ohos/backend/rs_surface_ohos_raster.cpp
View File

@ -42,7 +42,6 @@ std::unique_ptr<RSSurfaceFrame> RSSurfaceOhosRaster::RequestFrame(int32_t width,
int res = tempFence->Wait(3000);
if (res < 0) {
ROSEN_LOGE("RsDebug RSProcessor::RequestFrame this buffer is not available");
//TODO deal with the buffer is not available
}
std::unique_ptr<RSSurfaceFrame> ret(std::move(frame));
return ret;