From 86f33436cfc533ebb7a588564baa729ef1836322 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Thu, 11 Jul 2024 19:55:19 +0800 Subject: [PATCH 1/2] modify gn Signed-off-by: w30042960 --- bundle.json | 4 ---- .../distributedcamera/distributed_camera_source_service.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/bundle.json b/bundle.json index bf7be168..cc7dac6e 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,6 @@ ], "deps": { "components": [ - "access_token", "accessibility", "ipc", "init", @@ -56,9 +55,6 @@ "drivers_interface_camera", "access_token", "av_codec" - ], - "third_party": [ - "ffmpeg" ] }, "build": { diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp index 686964a6..b0bc57e4 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -213,10 +213,6 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s return ret; } CamDevInsert(camIndex, camDev); - } else { - DHLOGE("RegisterDistributedHardware exist devId: %{public}s, dhId: %{public}s, sinkVersion: %{public}s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), params.sinkVersion.c_str()); - return DCAMERA_ALREADY_EXISTS; } ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, params); -- Gitee From 7f87099d80dcff550b429aa8fad938e69e01a4ee Mon Sep 17 00:00:00 2001 From: w30042960 Date: Fri, 12 Jul 2024 10:36:44 +0800 Subject: [PATCH 2/2] modify gn Signed-off-by: w30042960 --- bundle.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bundle.json b/bundle.json index cc7dac6e..995acf6c 100644 --- a/bundle.json +++ b/bundle.json @@ -55,6 +55,9 @@ "drivers_interface_camera", "access_token", "av_codec" + ], + "third_party": [ + "ffmpeg" ] }, "build": { -- Gitee