From 3f538d7b00aace6554215cc30117171e0b70a1f3 Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Mon, 8 Apr 2024 14:59:54 +0800 Subject: [PATCH] =?UTF-8?q?cJSON=E6=95=B4=E6=94=B9=E5=92=8Cfwk=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: pwx1285814 --- bundle.json | 1 + services/screenservice/sinkservice/BUILD.gn | 1 + services/screenservice/sourceservice/BUILD.gn | 1 + .../sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 11 ++++++----- .../unittest/sinkservice/screenregionmgr/BUILD.gn | 1 + .../test/unittest/sourceservice/dscreenmgr/BUILD.gn | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bundle.json b/bundle.json index 9b9190cb..9af1d0e8 100644 --- a/bundle.json +++ b/bundle.json @@ -42,6 +42,7 @@ "safwk", "hicollie", "hitrace", + "cJSON", "c_utils", "window_manager", "distributed_hardware_fwk", diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 3dfa9c08..e6b197e5 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -79,6 +79,7 @@ ohos_shared_library("distributed_screen_sink") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "av_codec:av_codec_client", + "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributedhardwareutils", diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index c07ad192..d19e70a5 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -83,6 +83,7 @@ ohos_shared_library("distributed_screen_source") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "av_codec:av_codec_client", + "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index 63af917f..fa20fc15 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -31,6 +31,7 @@ #include "dscreen_util.h" #include "xcollie/watchdog.h" #include "common/include/screen_manager_adapter.h" +#include "cJSON.h" namespace OHOS { namespace DistributedHardware { @@ -523,8 +524,8 @@ int32_t DScreen::WaitForSinkStarted() int32_t DScreen::NegotiateCodecType(const std::string &rmtDecoderStr) { DHLOGI("Start NegotiateCodecType, remote decoder: %{public}s", rmtDecoderStr.c_str()); - json rmtDecoderJson = json::parse(rmtDecoderStr, nullptr, false); - if (rmtDecoderJson.is_discarded()) { + cJSON *rmtDecoderJson = cJSON_Parse(rmtDecoderStr.c_str()); + if (rmtDecoderJson == nullptr) { DHLOGE("remote Decoder Json is invalid."); return ERR_DH_SCREEN_SA_DSCREEN_NEGOTIATE_CODEC_FAIL; } @@ -545,8 +546,8 @@ int32_t DScreen::NegotiateCodecType(const std::string &rmtDecoderStr) } DHLOGI("DScreen Negotiate QueryVideoEncoderAbility info: %{public}s", localVideoEncodersJsonStr.c_str()); - json localVideoEncodersJson = json::parse(localVideoEncodersJsonStr, nullptr, false); - if (localVideoEncodersJson.is_discarded()) { + cJSON *localVideoEncodersJson = cJSON_Parse(localVideoEncodersJsonStr.c_str()); + if (localVideoEncodersJson == nullptr) { DHLOGE("localVideoEncodersJson is invalid."); return ERR_DH_SCREEN_SA_DSCREEN_NEGOTIATE_CODEC_FAIL; } diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn index 59b6980d..19d07043 100644 --- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn @@ -70,6 +70,7 @@ ohos_unittest("DscreenRegionMgrTest") { external_deps = [ "av_codec:av_codec_client", + "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributedhardwareutils", diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn index 0d990214..82b5ffeb 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn @@ -74,6 +74,7 @@ ohos_unittest("DscreenMgrTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "av_codec:av_codec_client", + "cJSON:cjson", "c_utils:utils", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", -- Gitee