From 50d714aa90f7382de41c830e9ef9236c34fb8932 Mon Sep 17 00:00:00 2001 From: hobbycao Date: Thu, 22 Sep 2022 11:19:25 +0800 Subject: [PATCH] fix: modify function name Signed-off-by: hobbycao --- .../include/distributedcameramgr/dcamera_source_dev.h | 8 ++++---- .../src/distributedcameramgr/dcamera_source_dev.cpp | 8 ++++---- .../dcamerahdf/dcamera_provider_callback_impl.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index e7fe9bc2..c82bc959 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -43,10 +43,10 @@ public: int32_t OpenSession(DCameraIndex& camIndex); int32_t CloseSession(DCameraIndex& camIndex); - int32_t ConfigStreams(const std::vector>& streamInfos); - int32_t ReleaseStreams(const std::vector& streamIds); - int32_t StartCapture(const std::vector>& captureInfos); - int32_t StopCapture(const std::vector& streamIds); + int32_t ConfigCameraStreams(const std::vector>& streamInfos); + int32_t ReleaseCameraStreams(const std::vector& streamIds); + int32_t StartCameraCapture(const std::vector>& captureInfos); + int32_t StopCameraCapture(const std::vector& streamIds); int32_t UpdateCameraSettings(const std::vector>& settings); void OnEvent(DCameraSourceEvent& event) override; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 2d480bd2..5d76c039 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -156,7 +156,7 @@ int32_t DCameraSourceDev::CloseSession(DCameraIndex& camIndex) return DCAMERA_OK; } -int32_t DCameraSourceDev::ConfigStreams(const std::vector>& streamInfos) +int32_t DCameraSourceDev::ConfigCameraStreams(const std::vector>& streamInfos) { DHLOGI("DCameraSourceDev PostTask ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); @@ -165,7 +165,7 @@ int32_t DCameraSourceDev::ConfigStreams(const std::vector& streamIds) +int32_t DCameraSourceDev::ReleaseCameraStreams(const std::vector& streamIds) { DHLOGI("DCameraSourceDev PostTask ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); @@ -174,7 +174,7 @@ int32_t DCameraSourceDev::ReleaseStreams(const std::vector& streamIds) return DCAMERA_OK; } -int32_t DCameraSourceDev::StartCapture(const std::vector>& captureInfos) +int32_t DCameraSourceDev::StartCameraCapture(const std::vector>& captureInfos) { DHLOGI("DCameraSourceDev PostTask StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); @@ -183,7 +183,7 @@ int32_t DCameraSourceDev::StartCapture(const std::vector& streamIds) +int32_t DCameraSourceDev::StopCameraCapture(const std::vector& streamIds) { DHLOGI("DCameraSourceDev PostTask StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index 47cafff0..5f036075 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -101,7 +101,7 @@ int32_t DCameraProviderCallbackImpl::ConfigureStreams(const DHBase& dhBase, stream->type_ = iter->type_; streams.push_back(stream); } - int32_t ret = sourceDev->ConfigStreams(streams); + int32_t ret = sourceDev->ConfigCameraStreams(streams); if (ret != DCAMERA_OK) { DHLOGE("DCameraProviderCallbackImpl CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); @@ -120,7 +120,7 @@ int32_t DCameraProviderCallbackImpl::ReleaseStreams(const DHBase& dhBase, const GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } - int32_t ret = sourceDev->ReleaseStreams(streamIds); + int32_t ret = sourceDev->ReleaseCameraStreams(streamIds); if (ret != DCAMERA_OK) { DHLOGE("DCameraProviderCallbackImpl ReleaseStreams failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); @@ -155,7 +155,7 @@ int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const st capture->captureSettings_.assign(iter->captureSettings_.begin(), iter->captureSettings_.end()); captures.push_back(capture); } - int32_t ret = sourceDev->StartCapture(captures); + int32_t ret = sourceDev->StartCameraCapture(captures); if (ret != DCAMERA_OK) { DHLOGE("DCameraProviderCallbackImpl StartCapture failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); @@ -174,7 +174,7 @@ int32_t DCameraProviderCallbackImpl::StopCapture(const DHBase& dhBase, const std GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } - int32_t ret = sourceDev->StopCapture(streamIds); + int32_t ret = sourceDev->StopCameraCapture(streamIds); if (ret != DCAMERA_OK) { DHLOGE("DCameraProviderCallbackImpl StopCapture failed, ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); -- Gitee