From 06ba8c8a32076f410f67dc1d045d8ec67a84a63d Mon Sep 17 00:00:00 2001 From: zhouaoteng Date: Wed, 13 Sep 2023 11:30:36 +0800 Subject: [PATCH] fix:Modify warnings and add depenencies Signed-off-by: zhouaoteng --- .../sinkproxychannelneg_fuzzer/BUILD.gn | 3 +-- .../sinkservicechannelneg_fuzzer/BUILD.gn | 4 ++-- .../sinkserviceclosechannel_fuzzer/BUILD.gn | 1 + .../sinkservicegetcamerainfo_fuzzer/BUILD.gn | 1 + .../sinkserviceinitsink_fuzzer/BUILD.gn | 4 ++-- .../sinkserviceopenchannel_fuzzer/BUILD.gn | 4 ++-- .../sinkservicereleasesink_fuzzer/BUILD.gn | 4 ++-- .../sinkservicestopcapture_fuzzer/BUILD.gn | 4 ++-- .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../sourceserviceinitsource_fuzzer/BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../base/include/dcamera_channel_info_cmd.h | 5 ++++- .../base/src/dcamera_channel_info_cmd.cpp | 22 +++++++++++++------ .../base/src/dcamera_event_cmd.cpp | 10 +++------ .../base/src/dcamera_metadata_setting_cmd.cpp | 8 +++---- .../base/src/dcamera_open_info_cmd.cpp | 2 +- .../base/test/unittest/common/base/BUILD.gn | 2 ++ .../client/test/sample/BUILD.gn | 2 ++ .../unittest/common/cameraoperator/BUILD.gn | 2 ++ .../cameraoperator/handler/BUILD.gn | 2 ++ .../unittest/common/dcamerahandler/BUILD.gn | 1 + services/cameraservice/sinkservice/BUILD.gn | 1 + .../common/distributedcamera/BUILD.gn | 2 ++ .../common/distributedcameramgr/BUILD.gn | 1 + services/cameraservice/sourceservice/BUILD.gn | 1 + .../common/distributedcamera/BUILD.gn | 2 ++ .../common/distributedcameramgr/BUILD.gn | 2 ++ .../test/unittest/common/channel/BUILD.gn | 2 ++ 32 files changed, 67 insertions(+), 32 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn index 4b6597fe..1e3623d0 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer/BUILD.gn @@ -21,8 +21,7 @@ import( ohos_fuzztest("SinkProxyChannelNegFuzzTest") { module_out_path = "distributed_camera/sinkproxychannelneg" - fuzz_config_file = - "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer" + fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkproxychannelneg_fuzzer" include_dirs = [ "${fwk_common_path}/utils/include" ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn index f49991ad..831f644e 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn @@ -21,8 +21,7 @@ import( ohos_fuzztest("SinkServiceChannelNegFuzzTest") { module_out_path = "distributed_camera/sinkservicechannelneg" - fuzz_config_file = - "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer" + fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer" include_dirs = [ "${fwk_common_path}/utils/include" ] @@ -35,6 +34,7 @@ ohos_fuzztest("SinkServiceChannelNegFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn index 5fde2292..16c80a8f 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn @@ -34,6 +34,7 @@ ohos_fuzztest("SinkServiceCloseChannelFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn index f90531cd..fadcb702 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn @@ -34,6 +34,7 @@ ohos_fuzztest("SinkServiceGetCameraInfoFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn index 807420d7..2de4ff42 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn @@ -21,8 +21,7 @@ import( ohos_fuzztest("SinkServiceInitSinkFuzzTest") { module_out_path = "distributed_camera/sinkserviceinitsink" - fuzz_config_file = - "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer" + fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer" include_dirs = [ "${fwk_common_path}/utils/include" ] @@ -35,6 +34,7 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn index 9045efaa..cfe9e0ff 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn @@ -21,8 +21,7 @@ import( ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { module_out_path = "distributed_camera/sinkserviceopenchannel" - fuzz_config_file = - "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer" + fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer" include_dirs = [ "${fwk_common_path}/utils/include" ] @@ -35,6 +34,7 @@ ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn index 3698a428..89990eda 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn @@ -21,8 +21,7 @@ import( ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { module_out_path = "distributed_camera/sinkservicereleasesink" - fuzz_config_file = - "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer" + fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer" include_dirs = [ "${fwk_common_path}/utils/include" ] @@ -35,6 +34,7 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn index 261593d3..9da011f8 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn @@ -21,8 +21,7 @@ import( ohos_fuzztest("SinkServiceStopCaptureFuzzTest") { module_out_path = "distributed_camera/sinkservicestopcapture" - fuzz_config_file = - "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer" + fuzz_config_file = "${innerkits_path}/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer" include_dirs = [ "${fwk_common_path}/utils/include" ] @@ -35,6 +34,7 @@ ohos_fuzztest("SinkServiceStopCaptureFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn index df2fa4c3..0069753d 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn @@ -34,6 +34,7 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn index 0aecb0d9..21a2e5ed 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn @@ -34,6 +34,7 @@ ohos_fuzztest("SinkServiceUnsubscribeLocalHardwareFuzzTest") { "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn index b78631f3..cbcd0506 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("SourceServiceDCameraNotifyFuzzTest") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index 9f32b7aa..2d698908 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index 29a015a1..6a91f5d5 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -47,6 +47,7 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index 69f2c76d..c0a5e651 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index cf95b4f2..d18438f4 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -47,6 +47,7 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/services/cameraservice/base/include/dcamera_channel_info_cmd.h b/services/cameraservice/base/include/dcamera_channel_info_cmd.h index deedd337..316c3aac 100644 --- a/services/cameraservice/base/include/dcamera_channel_info_cmd.h +++ b/services/cameraservice/base/include/dcamera_channel_info_cmd.h @@ -19,7 +19,7 @@ #include #include #include - +#include "cJSON.h" #include "v1_0/dcamera_types.h" namespace OHOS { @@ -52,6 +52,9 @@ public: public: int32_t Marshal(std::string& jsonStr); int32_t Unmarshal(const std::string& jsonStr); + +private: + int32_t UnmarshalDetails(cJSON *details, std::shared_ptr channelInfo); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp index b7d737cc..4057ea91 100644 --- a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp @@ -54,7 +54,7 @@ int32_t DCameraChannelInfoCmd::Marshal(std::string& jsonStr) cJSON_AddStringToObject(detail, "DataSessionFlag", iter->dataSessionFlag_.c_str()); cJSON_AddNumberToObject(detail, "StreamType", iter->streamType_); cJSON_AddItemToArray(details, detail); - } + } char *jsonstr = cJSON_Print(rootValue); if (jsonstr == nullptr) { @@ -108,16 +108,26 @@ int32_t DCameraChannelInfoCmd::Unmarshal(const std::string& jsonStr) cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; } + if (UnmarshalDetails(details, channelInfo) != DCAMERA_OK) { + cJSON_Delete(rootValue); + return DCAMERA_BAD_VALUE; + } + value_ = channelInfo; + cJSON_Delete(rootValue); + return DCAMERA_OK; +} + +int32_t DCameraChannelInfoCmd::UnmarshalDetails(cJSON *details, std::shared_ptr channelInfo) +{ cJSON *detail = nullptr; cJSON_ArrayForEach(detail, details) { cJSON *dataSessionFlag = cJSON_GetObjectItemCaseSensitive(detail, "DataSessionFlag"); cJSON *streamType = cJSON_GetObjectItemCaseSensitive(detail, "StreamType"); - if (dataSessionFlag == nullptr || !cJSON_IsString(dataSessionFlag) || (dataSessionFlag->valuestring == nullptr)){ - cJSON_Delete(rootValue); + if (dataSessionFlag == nullptr || !cJSON_IsString(dataSessionFlag) || + (dataSessionFlag->valuestring == nullptr)) { return DCAMERA_BAD_VALUE; } - if (streamType == nullptr || !cJSON_IsNumber(streamType)){ - cJSON_Delete(rootValue); + if (streamType == nullptr || !cJSON_IsNumber(streamType)) { return DCAMERA_BAD_VALUE; } DCameraChannelDetail channelDetail; @@ -125,8 +135,6 @@ int32_t DCameraChannelInfoCmd::Unmarshal(const std::string& jsonStr) channelDetail.streamType_ = static_cast(streamType->valueint); channelInfo->detail_.push_back(channelDetail); } - value_ = channelInfo; - cJSON_Delete(rootValue); return DCAMERA_OK; } } // namespace DistributedHardware diff --git a/services/cameraservice/base/src/dcamera_event_cmd.cpp b/services/cameraservice/base/src/dcamera_event_cmd.cpp index 24c9a562..623dcefa 100644 --- a/services/cameraservice/base/src/dcamera_event_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_event_cmd.cpp @@ -59,16 +59,13 @@ int32_t DCameraEventCmd::Unmarshal(const std::string& jsonStr) return DCAMERA_BAD_VALUE; } cJSON *type = cJSON_GetObjectItemCaseSensitive(rootValue, "Type"); - if (type == nullptr || !cJSON_IsString(type) || (type->valuestring == nullptr)) { - cJSON_Delete(rootValue); - return DCAMERA_BAD_VALUE; - } - type_ = type->valuestring; cJSON *dhId = cJSON_GetObjectItemCaseSensitive(rootValue, "dhId"); - if (dhId == nullptr || !cJSON_IsString(dhId) || (dhId->valuestring == nullptr)) { + if (type == nullptr || !cJSON_IsString(type) || (type->valuestring == nullptr) || + dhId == nullptr || !cJSON_IsString(dhId) || (dhId->valuestring == nullptr)) { cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; } + type_ = type->valuestring; dhId_ = dhId->valuestring; cJSON *command = cJSON_GetObjectItemCaseSensitive(rootValue, "Command"); if (command == nullptr || !cJSON_IsString(command) || (command->valuestring == nullptr)) { @@ -100,7 +97,6 @@ int32_t DCameraEventCmd::Unmarshal(const std::string& jsonStr) return DCAMERA_BAD_VALUE; } event->eventContent_ = eventContent->valuestring; - value_ = event; cJSON_Delete(rootValue); return DCAMERA_OK; diff --git a/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp b/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp index b3706557..8f2e24f4 100644 --- a/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_metadata_setting_cmd.cpp @@ -36,14 +36,14 @@ int32_t DCameraMetadataSettingCmd::Marshal(std::string& jsonStr) if (settings == nullptr) { cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; - } + } cJSON_AddItemToObject(rootValue, "Value", settings); for (auto iter = value_.begin(); iter != value_.end(); iter++) { cJSON *setting = cJSON_CreateObject(); if (setting == nullptr) { cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; - } + } cJSON_AddNumberToObject(setting, "SettingType", (*iter)->type_); cJSON_AddStringToObject(setting, "SettingValue", (*iter)->value_.c_str()); cJSON_AddItemToArray(settings, setting); @@ -93,11 +93,11 @@ int32_t DCameraMetadataSettingCmd::Unmarshal(const std::string& jsonStr) cJSON_ArrayForEach(subSetting, settings) { cJSON *settingType = cJSON_GetObjectItemCaseSensitive(subSetting, "SettingType"); cJSON *settingValue = cJSON_GetObjectItemCaseSensitive(subSetting, "SettingValue"); - if (settingType == nullptr || !cJSON_IsNumber(settingType)){ + if (settingType == nullptr || !cJSON_IsNumber(settingType)) { cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; } - if (settingValue == nullptr || !cJSON_IsString(settingValue) || (settingValue->valuestring == nullptr)){ + if (settingValue == nullptr || !cJSON_IsString(settingValue) || (settingValue->valuestring == nullptr)) { cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; } diff --git a/services/cameraservice/base/src/dcamera_open_info_cmd.cpp b/services/cameraservice/base/src/dcamera_open_info_cmd.cpp index f098b033..f7822240 100644 --- a/services/cameraservice/base/src/dcamera_open_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_open_info_cmd.cpp @@ -36,7 +36,7 @@ int32_t DCameraOpenInfoCmd::Marshal(std::string& jsonStr) if (openInfo == nullptr) { cJSON_Delete(rootValue); return DCAMERA_BAD_VALUE; - } + } cJSON_AddStringToObject(openInfo, "SourceDevId", value_->sourceDevId_.c_str()); cJSON_AddItemToObject(rootValue, "Value", openInfo); diff --git a/services/cameraservice/base/test/unittest/common/base/BUILD.gn b/services/cameraservice/base/test/unittest/common/base/BUILD.gn index fe91dd98..dca30f13 100755 --- a/services/cameraservice/base/test/unittest/common/base/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/base/BUILD.gn @@ -33,6 +33,7 @@ config("module_private_config") { "${services_path}/cameraservice/base/include", "${common_path}/include/constants", "${common_path}/include/utils", + "//third_party/cJSON", ] } @@ -57,6 +58,7 @@ ohos_unittest("DCameraServicesBaseTest") { "${fwk_utils_path}:distributedhardwareutils", "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", + "//third_party/cJSON:cjson", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index 2042b601..46d33bf0 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -18,6 +18,7 @@ import( config("module_private_config") { include_dirs = [ + "//third_party/cJSON", "//third_party/jsoncpp/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -67,6 +68,7 @@ ohos_executable("dcamera_client_demo") { "${graphicstandard_path}:libsurface", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", + "//third_party/cJSON:cjson", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index 333c8bef..69e52120 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -20,6 +20,7 @@ module_out_path = "distributed_camera/dcamera_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//third_party/cJSON", "//third_party/jsoncpp/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -62,6 +63,7 @@ ohos_unittest("DCameraClientTest") { "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", + "//third_party/cJSON:cjson", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index a08eb771..eee49176 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -18,6 +18,7 @@ import( ohos_shared_library("distributed_camera_handler") { include_dirs = [ + "//third_party/cJSON", "//third_party/jsoncpp/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -50,6 +51,7 @@ ohos_shared_library("distributed_camera_handler") { deps = [ "${common_path}:distributed_camera_utils", + "//third_party/cJSON:cjson", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn index 13acb9c1..ddcce166 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -54,6 +54,7 @@ ohos_unittest("DCameraHandlerTest") { "${common_path}:distributed_camera_utils", "${graphicstandard_path}:libsurface", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", + "//third_party/cJSON:cjson", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 758d5a0c..830602c1 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -30,6 +30,7 @@ ohos_shared_library("distributed_camera_sink") { "${camerastandard_path}/services/camera_service/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 51199922..7ba21cc6 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -20,6 +20,7 @@ module_out_path = "distributed_camera/dcamera_sink_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//third_party/cJSON", "//third_party/jsoncpp/include", "${graphicstandard_path}/frameworks/surface/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", @@ -63,6 +64,7 @@ ohos_unittest("DistributedCameraSinkServiceTest") { "${innerkits_path}/native_cpp/camera_sink:distributed_camera_sink_sdk", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", + "//third_party/cJSON:cjson", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 98aef82d..1f79a5dd 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -76,6 +76,7 @@ ohos_unittest("DCameraSinkMgrTest") { "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", "${services_path}/channel:distributed_camera_channel", + "//third_party/cJSON:cjson", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index a7784e7c..09f33f1a 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -21,6 +21,7 @@ ohos_shared_library("distributed_camera_source") { "${av_transport_path}/common/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", + "//third_party/cJSON", "//third_party/jsoncpp/include", ] diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn index 4f5f9fb8..f079e282 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn @@ -44,6 +44,7 @@ config("module_private_config") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", "//drivers/peripheral/base/", "${graphicstandard_path}/frameworks/surface/include", @@ -69,6 +70,7 @@ ohos_unittest("DCameraSourceTest") { "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", + "//third_party/cJSON:cjson", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index 36b0c318..4ff94009 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -44,6 +44,7 @@ config("module_private_config") { "${fwk_utils_path}/include", "${fwk_utils_path}/include/eventbus", "${fwk_common_path}/utils/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", "//drivers/peripheral/base/", "${graphicstandard_path}/frameworks/surface/include", @@ -80,6 +81,7 @@ ohos_unittest("DCameraSourceMgrTest") { "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", "${services_path}/data_process:distributed_camera_data_process", + "//third_party/cJSON:cjson", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn index 3fc50766..b5d17d89 100644 --- a/services/channel/test/unittest/common/channel/BUILD.gn +++ b/services/channel/test/unittest/common/channel/BUILD.gn @@ -48,6 +48,7 @@ config("module_private_config") { "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", "${graphicstandard_path}/frameworks/surface/include", + "//third_party/cJSON", "//third_party/jsoncpp/include", "${feeding_smoother_path}/base", ] @@ -80,6 +81,7 @@ ohos_unittest("DCameraChannelTest") { "${services_path}/cameraservice/sinkservice:distributed_camera_sink", "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/data_process:distributed_camera_data_process", + "//third_party/cJSON:cjson", "//third_party/jsoncpp:jsoncpp", ] -- Gitee