From 47c348f9056abac423e02133e36e57b2963c4793 Mon Sep 17 00:00:00 2001
From: byndyx <baiyanan2@huawei.com>
Date: Fri, 29 Mar 2024 10:28:30 +0800
Subject: [PATCH] 32->64

Signed-off-by: byndyx <baiyanan2@huawei.com>
---
 .../cameraoperator/client/test/sample/main.cpp         |  2 +-
 .../cameraoperator/handler/src/dcamera_handler.cpp     |  4 ++--
 .../decoder/decode_data_process_common.cpp             | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/cameraservice/cameraoperator/client/test/sample/main.cpp b/services/cameraservice/cameraoperator/client/test/sample/main.cpp
index 39cb1f07..86287d47 100644
--- a/services/cameraservice/cameraoperator/client/test/sample/main.cpp
+++ b/services/cameraservice/cameraoperator/client/test/sample/main.cpp
@@ -245,7 +245,7 @@ static void ConfigFocusAndExposure()
         return;
     }
     if (!biasRange.empty()) {
-        DHLOGI("Distributed Camera Demo: get %{public}d exposure compensation range", biasRange.size());
+        DHLOGI("Distributed Camera Demo: get %{public}zu exposure compensation range", biasRange.size());
         exposureValue = biasRange[0];
     }
     g_captureSession->SetFocusMode(focusMode);
diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp
index 5562cf7c..f284fee1 100644
--- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp
+++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp
@@ -264,7 +264,7 @@ void DCameraHandler::ProcessProfile(const DCStreamType type, std::map<std::strin
 void DCameraHandler::ConfigFormatphoto(const DCStreamType type, cJSON* root,
     std::vector<CameraStandard::Profile>& profileList)
 {
-    DHLOGI("type: %d, size: %d", type, profileList.size());
+    DHLOGI("type: %d, size: %{public}zu", type, profileList.size());
     std::set<int32_t> formatSet;
     cJSON* formatphotoObj = cJSON_CreateObject();
     if (formatphotoObj == nullptr) {
@@ -298,7 +298,7 @@ void DCameraHandler::ConfigFormatphoto(const DCStreamType type, cJSON* root,
 void DCameraHandler::ConfigFormatvideo(const DCStreamType type, cJSON* root,
     std::vector<CameraStandard::Profile>& profileList)
 {
-    DHLOGI("type: %d, size: %d", type, profileList.size());
+    DHLOGI("type: %d, size: %{public}zu", type, profileList.size());
     std::set<int32_t> formatSet;
     cJSON* formatpreviewObj = cJSON_CreateObject();
     if (formatpreviewObj == nullptr) {
diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp
index 13389664..23aaee75 100644
--- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp
+++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp
@@ -484,7 +484,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer()
         }
 
         inputBuffersQueue_.pop();
-        DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %{public}d.", inputBuffersQueue_.size());
+        DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %{public}zu.", inputBuffersQueue_.size());
 
         IncreaseWaitDecodeCnt();
     }
@@ -620,7 +620,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr<SurfaceBuffer>& surBuf
             RGB32_MEMORY_COEFFICIENT);
         size_t surfaceBufSize = static_cast<size_t>(surBuf->GetSize());
         if (rgbImageSize > surfaceBufSize) {
-            DHLOGE("Buffer size error, rgbImageSize %{public}zu, surBufSize %{public}zu.", rgbImageSize,
+            DHLOGE("Buffer size error, rgbImageSize %{public}zu, surBufSize %{public}" PRIu32, rgbImageSize,
                 surBuf->GetSize());
             return false;
         }
@@ -632,7 +632,7 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr<SurfaceBuffer>& surBuf
             sourceConfig_.GetWidth() * sourceConfig_.GetHeight() * YUV_BYTES_PER_PIXEL / Y2UV_RATIO);
         if (yuvImageAlignedSize > surfaceBufSize || yuvImageAlignedSize < yuvImageSize) {
             DHLOGE("Buffer size error, yuvImageSize %{public}zu, yuvImageAlignedSize %{public}zu, surBufSize "
-                "%{public}zu.", yuvImageSize, yuvImageAlignedSize, surBuf->GetSize());
+                "%{public}" PRIu32, yuvImageSize, yuvImageAlignedSize, surBuf->GetSize());
             return false;
         }
     }
@@ -759,8 +759,8 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const MediaAVCod
         DHLOGE("Decoder node occurred error or start release.");
         return;
     }
-    DHLOGD("Video decode buffer info: presentation TimeUs %{public}lld, size %{public}d, offset %{public}d, flag "
-        "%{public}d", info.presentationTimeUs, info.size, info.offset, flag);
+    DHLOGD("Video decode buffer info: presentation TimeUs %{public}" PRId64", size %{public}d, offset %{public}d, flag "
+        "%{public}" PRIu32, info.presentationTimeUs, info.size, info.offset, flag);
     outputInfo_ = info;
     {
         std::lock_guard<std::mutex> lock(mtxDequeLock_);
-- 
Gitee