From b7630004ee25b4682716dc02cb9c12e5b1dcf700 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Tue, 19 Jul 2022 14:00:30 +0800 Subject: [PATCH 1/2] fix: modify dcamera apl grade Signed-off-by: wangchaole --- sa_profile/dcamera.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa_profile/dcamera.cfg b/sa_profile/dcamera.cfg index 850c00b5..c20dda4a 100644 --- a/sa_profile/dcamera.cfg +++ b/sa_profile/dcamera.cfg @@ -5,7 +5,7 @@ "uid" : "dcamera", "gid" : ["dcamera"], "ondemand" : true, - "apl" : "system_core", + "apl" : "system_basic", "permission" : ["ohos.permission.DISTRIBUTED_DATASYNC"], "secon" : "u:r:dcamera:s0" }] -- Gitee From 3f941e4943bf6424c7c90c2fda5ecca7ce69e301 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Mon, 25 Jul 2022 15:05:19 +0800 Subject: [PATCH 2/2] fix: clear codex Signed-off-by: wangchaole --- common/src/utils/dcamera_utils_tools.cpp | 4 ++-- sa_profile/dcamera.cfg | 2 +- .../dcamerahdf/dcamera_hdf_operate.cpp | 2 -- .../scale_conversion/scale_convert_process.h | 10 +++++----- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/common/src/utils/dcamera_utils_tools.cpp b/common/src/utils/dcamera_utils_tools.cpp index 802aca79..f66a9838 100644 --- a/common/src/utils/dcamera_utils_tools.cpp +++ b/common/src/utils/dcamera_utils_tools.cpp @@ -99,7 +99,7 @@ std::string Base64Encode(const unsigned char *toEncode, unsigned int len) } } - if (i) { + if (i > 0) { uint32_t j = 0; for (j = i; j < sizeof(charArray3); j++) { charArray3[j] = '\0'; @@ -148,7 +148,7 @@ std::string Base64Decode(const std::string& basicString) } } - if (i) { + if (i > 0) { uint32_t j = 0; for (j = i; j < sizeof(charArray4); j++) { charArray4[j] = 0; diff --git a/sa_profile/dcamera.cfg b/sa_profile/dcamera.cfg index c20dda4a..850c00b5 100644 --- a/sa_profile/dcamera.cfg +++ b/sa_profile/dcamera.cfg @@ -5,7 +5,7 @@ "uid" : "dcamera", "gid" : ["dcamera"], "ondemand" : true, - "apl" : "system_basic", + "apl" : "system_core", "permission" : ["ohos.permission.DISTRIBUTED_DATASYNC"], "secon" : "u:r:dcamera:s0" }] diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp index 35cd8660..a9acca8f 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.cpp @@ -71,7 +71,6 @@ int32_t DCameraHdfOperate::LoadDcameraHDFImpl() return DCAMERA_BAD_OPERATE; } if (WaitLoadCameraService() != DCAMERA_OK) { - DHLOGE("Wait load camera service failed!"); return DCAMERA_BAD_OPERATE; } @@ -81,7 +80,6 @@ int32_t DCameraHdfOperate::LoadDcameraHDFImpl() return DCAMERA_BAD_OPERATE; } if (WaitLoadProviderService() != DCAMERA_OK) { - DHLOGE("Wait load provider service failed!"); return DCAMERA_BAD_OPERATE; } diff --git a/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h b/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h index 922f968b..ea4749d2 100644 --- a/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h +++ b/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h @@ -70,11 +70,11 @@ private: constexpr static int32_t YUV_BYTES_PER_PIXEL = 3; constexpr static int32_t Y2UV_RATIO = 2; - uint8_t *srcData_[DATA_LEN]; - uint8_t *dstData_[DATA_LEN]; - int32_t srcLineSize_[DATA_LEN]; - int32_t dstLineSize_[DATA_LEN]; - int32_t dstBuffSize_; + uint8_t *srcData_[DATA_LEN] = { nullptr }; + uint8_t *dstData_[DATA_LEN] = { nullptr }; + int32_t srcLineSize_[DATA_LEN] = { 0 }; + int32_t dstLineSize_[DATA_LEN] = { 0 }; + int32_t dstBuffSize_ = 0; SwsContext *swsContext_ = nullptr; VideoConfigParams sourceConfig_; VideoConfigParams targetConfig_; -- Gitee