From e361ca789e2ef29d3d01d3b676bb9d80f5937f6f Mon Sep 17 00:00:00 2001 From: biga2021 Date: Sun, 24 Apr 2022 17:52:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9Aupdate=20path=20of=20metadata?= =?UTF-8?q?=20in=20BUILD.gn=20and=20fix=20namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: biga2021 --- camera_hdf/hdi_impl/BUILD.gn | 4 +- .../dcamera_device/dmetadata_processor.h | 4 +- .../dstream_operator/dstream_operator.h | 10 ++-- .../src/dcamera_device/dcamera_device.cpp | 6 +-- .../dcamera_device/dmetadata_processor.cpp | 46 +++++++++---------- .../src/dstream_operator/dstream_operator.cpp | 10 ++-- camera_hdf/hdi_impl/test/BUILD.gn | 4 +- camera_hdf/hdi_impl/test/common.cpp | 2 +- camera_hdf/interfaces/hdi_ipc/client/BUILD.gn | 4 +- .../client/device/dcamera_device_callback.cpp | 2 +- .../client/device/dcamera_device_callback.h | 2 +- .../device/dcamera_device_callback_stub.cpp | 4 +- .../client/device/dcamera_device_proxy.cpp | 2 +- .../client/host/dcamera_host_proxy.cpp | 2 +- .../operator/dstream_operator_proxy.cpp | 10 ++-- .../client/operator/dstream_operator_proxy.h | 4 +- .../interfaces/hdi_ipc/config/host/BUILD.gn | 2 +- .../hdi_ipc/config/provider/BUILD.gn | 2 +- .../device/dcamera_device_callback_proxy.cpp | 4 +- .../device/dcamera_device_callback_proxy.h | 2 +- .../server/device/dcamera_device_stub.cpp | 4 +- .../hdi_ipc/server/host/dcamera_host_stub.cpp | 2 +- .../server/operator/dstream_operator_stub.cpp | 12 ++--- .../cameraoperator/client/BUILD.gn | 4 +- .../client/include/dcamera_client.h | 2 +- .../client/src/dcamera_client.cpp | 12 ++--- .../unittest/common/cameraoperator/BUILD.gn | 4 +- .../cameraoperator/handler/BUILD.gn | 4 +- .../unittest/common/dcamerahandler/BUILD.gn | 24 +++++----- services/cameraservice/sinkservice/BUILD.gn | 4 +- .../common/distributedcameramgr/BUILD.gn | 4 +- 31 files changed, 101 insertions(+), 101 deletions(-) diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index 73629d1b..88d7e2c1 100644 --- a/camera_hdf/hdi_impl/BUILD.gn +++ b/camera_hdf/hdi_impl/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("distributed_camera_hdf") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/buffer_handle/export", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", + "//drivers/peripheral/camera/interfaces/metadata/include", "${camera_hdf_path}/camera/interfaces/include", "${camera_hdf_path}/camera/interfaces/hdi_ipc", @@ -84,9 +84,9 @@ ohos_shared_library("distributed_camera_hdf") { "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//drivers/peripheral/display/hal:hdi_display_gralloc", "//foundation/graphic/standard/frameworks/surface:surface", - "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h index a0c9ded8..7bd9714a 100644 --- a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h +++ b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h @@ -46,7 +46,7 @@ public: DCamRetCode DisableMetadataResult(const std::vector &results); DCamRetCode ResetEnableResults(); DCamRetCode SaveResultMetadata(std::string resultStr); - DCamRetCode UpdateResultMetadata(bool &needReturn, std::shared_ptr &result); + DCamRetCode UpdateResultMetadata(bool &needReturn, std::shared_ptr &result); void PrintDCameraMetadata(const common_metadata_header_t *metadata); private: @@ -55,7 +55,7 @@ private: DCamRetCode AddAbilityEntry(uint32_t tag, const void *data, size_t size); DCamRetCode UpdateAbilityEntry(uint32_t tag, const void *data, size_t size); void ConvertToCameraMetadata(common_metadata_header_t *&input, - std::shared_ptr &output); + std::shared_ptr &output); void ResizeMetadataHeader(common_metadata_header_t *header, uint32_t itemCapacity, uint32_t dataCapacity); uint32_t GetDataSize(uint32_t type); std::map> GetDCameraSupportedFormats(const std::string &abilityInfo); diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h b/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h index 8e012fa6..4f1a4bc3 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h @@ -43,13 +43,13 @@ public: public: CamRetCode IsStreamsSupported(OperationMode mode, - const std::shared_ptr &modeSetting, + const std::shared_ptr &modeSetting, const std::vector> &info, StreamSupportType &type) override; CamRetCode CreateStreams(const std::vector>& streamInfos) override; CamRetCode ReleaseStreams(const std::vector& streamIds) override; CamRetCode CommitStreams(OperationMode mode, - const std::shared_ptr& modeSetting) override; + const std::shared_ptr& modeSetting) override; CamRetCode GetStreamAttributes(std::vector>& attributes) override; CamRetCode AttachBufferQueue(int streamId, const OHOS::sptr& producer) override; CamRetCode DetachBufferQueue(int streamId) override; @@ -63,7 +63,7 @@ public: DCamRetCode ShutterBuffer(int streamId, const std::shared_ptr &buffer); DCamRetCode SetCallBack(OHOS::sptr const &callback); DCamRetCode SetDeviceCallback(function &errorCbk, - function)> &resultCbk); + function)> &resultCbk); void Release(); private: @@ -88,7 +88,7 @@ private: std::shared_ptr dMetadataProcessor_; OHOS::sptr dcStreamOperatorCallback_; function errorCallback_; - function)> resultCallback_; + function)> resultCallback_; std::shared_ptr dhBase_; std::vector dcSupportedCodecType_; @@ -106,7 +106,7 @@ private: bool isCapturing_ = false; std::mutex isCapturingLock_; OperationMode currentOperMode_ = OperationMode::NORMAL; - std::shared_ptr latestStreamSetting_; + std::shared_ptr latestStreamSetting_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp index c5c245bd..bad778bd 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp @@ -26,7 +26,7 @@ namespace OHOS { namespace DistributedHardware { using ErrorCallback = std::function; -using ResultCallback = std::function)>; +using ResultCallback = std::function)>; DCameraDevice::DCameraDevice(const std::shared_ptr &dhBase, const std::string &abilityInfo) : isOpened_(false), dCameraId_(GenerateCameraId(dhBase)), @@ -71,7 +71,7 @@ DCamRetCode DCameraDevice::CreateDStreamOperator() } }; ResultCallback onResultCallback = - [this](uint64_t timestamp, const std::shared_ptr &result) -> void { + [this](uint64_t timestamp, const std::shared_ptr &result) -> void { if (dCameraDeviceCallback_) { dCameraDeviceCallback_->OnResult(timestamp, result); } @@ -119,7 +119,7 @@ CamRetCode DCameraDevice::UpdateSettings(const std::shared_ptr &s std::shared_ptr dcSetting = std::make_shared(); dcSetting->type_ = DCSettingsType::UPDATE_METADATA; - std::string abilityStr = CameraStandard::MetadataUtils::EncodeToString(settings); + std::string abilityStr = Camera::MetadataUtils::EncodeToString(settings); dcSetting->value_ = Base64Encode(reinterpret_cast(abilityStr.c_str()), abilityStr.length()); std::vector> dcSettings; diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp index 93ab3142..aaf8aa35 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp @@ -43,7 +43,7 @@ DCamRetCode DMetadataProcessor::InitDCameraAbility(const std::string &abilityInf std::string decodeString = Base64Decode(metadataStr); DHLOGI("Decode distributed camera metadata from string, hash: %zu, length: %zu", h(decodeString), decodeString.length()); - dCameraAbility_ = CameraStandard::MetadataUtils::DecodeFromString(decodeString); + dCameraAbility_ = Camera::MetadataUtils::DecodeFromString(decodeString); DHLOGI("Decode distributed camera metadata from string success."); } } @@ -54,7 +54,7 @@ DCamRetCode DMetadataProcessor::InitDCameraAbility(const std::string &abilityInf dCameraAbility_ = std::make_shared(DEFAULT_ENTRY_CAPACITY, DEFAULT_DATA_CAPACITY); } - if (CameraStandard::GetCameraMetadataItemCount(dCameraAbility_->get()) <= 0) { + if (Camera::GetCameraMetadataItemCount(dCameraAbility_->get()) <= 0) { DCamRetCode ret = InitDCameraDefaultAbilityKeys(abilityInfo); if (ret != SUCCESS) { DHLOGE("Init distributed camera defalult abilily keys failed."); @@ -70,7 +70,7 @@ DCamRetCode DMetadataProcessor::InitDCameraAbility(const std::string &abilityInf return ret; } - camera_metadata_item_entry_t* itemEntry = CameraStandard::GetMetadataItems(dCameraAbility_->get()); + camera_metadata_item_entry_t* itemEntry = Camera::GetMetadataItems(dCameraAbility_->get()); uint32_t count = dCameraAbility_->get()->item_count; for (uint32_t i = 0; i < count; i++, itemEntry++) { allResultSet_.insert((MetaType)(itemEntry->item)); @@ -252,7 +252,7 @@ DCamRetCode DMetadataProcessor::AddAbilityEntry(uint32_t tag, const void *data, } camera_metadata_item_t item; - int ret = CameraStandard::FindCameraMetadataItem(dCameraAbility_->get(), tag, &item); + int ret = Camera::FindCameraMetadataItem(dCameraAbility_->get(), tag, &item); if (ret) { if (!dCameraAbility_->addEntry(tag, data, size)) { DHLOGE("Add tag %u failed.", tag); @@ -270,7 +270,7 @@ DCamRetCode DMetadataProcessor::UpdateAbilityEntry(uint32_t tag, const void *dat } camera_metadata_item_t item; - int ret = CameraStandard::FindCameraMetadataItem(dCameraAbility_->get(), tag, &item); + int ret = Camera::FindCameraMetadataItem(dCameraAbility_->get(), tag, &item); if (ret) { if (!dCameraAbility_->addEntry(tag, data, size)) { DHLOGE("Add tag %u failed.", tag); @@ -366,19 +366,19 @@ DCamRetCode DMetadataProcessor::ResetEnableResults() } DCamRetCode DMetadataProcessor::UpdateResultMetadata(bool &needReturn, - std::shared_ptr &result) + std::shared_ptr &result) { if (latestProducerResultMetadata_ == nullptr) { needReturn = false; return SUCCESS; } - uint32_t itemCapacity = CameraStandard::GetCameraMetadataItemCapacity(latestProducerResultMetadata_); - uint32_t dataCapacity = CameraStandard::GetCameraMetadataDataSize(latestProducerResultMetadata_); + uint32_t itemCapacity = Camera::GetCameraMetadataItemCapacity(latestProducerResultMetadata_); + uint32_t dataCapacity = Camera::GetCameraMetadataDataSize(latestProducerResultMetadata_); if (metaResultMode_ == ResultCallbackMode::PER_FRAME) { ResizeMetadataHeader(latestConsumerResultMetadata_, itemCapacity, dataCapacity); - CameraStandard::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); + Camera::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); ConvertToCameraMetadata(latestConsumerResultMetadata_, result); needReturn = true; return SUCCESS; @@ -386,12 +386,12 @@ DCamRetCode DMetadataProcessor::UpdateResultMetadata(bool &needReturn, for (auto tag : enabledResultSet_) { camera_metadata_item_t item; camera_metadata_item_t anoItem; - int ret1 = CameraStandard::FindCameraMetadataItem(latestProducerResultMetadata_, tag, &item); - int ret2 = CameraStandard::FindCameraMetadataItem(latestConsumerResultMetadata_, tag, &anoItem); + int ret1 = Camera::FindCameraMetadataItem(latestProducerResultMetadata_, tag, &item); + int ret2 = Camera::FindCameraMetadataItem(latestConsumerResultMetadata_, tag, &anoItem); if (ret1 == 0 && ret2 == 0) { if (item.count != anoItem.count || item.data_type != anoItem.data_type) { ResizeMetadataHeader(latestConsumerResultMetadata_, itemCapacity, dataCapacity); - CameraStandard::CopyCameraMetadataItems(latestConsumerResultMetadata_, + Camera::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); ConvertToCameraMetadata(latestConsumerResultMetadata_, result); needReturn = true; @@ -401,7 +401,7 @@ DCamRetCode DMetadataProcessor::UpdateResultMetadata(bool &needReturn, for (uint32_t i = 0; i < (size * static_cast(item.count)); i++) { if (*(item.data.u8 + i) != *(anoItem.data.u8 + i)) { ResizeMetadataHeader(latestConsumerResultMetadata_, itemCapacity, dataCapacity); - CameraStandard::CopyCameraMetadataItems(latestConsumerResultMetadata_, + Camera::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); ConvertToCameraMetadata(latestConsumerResultMetadata_, result); needReturn = true; @@ -409,13 +409,13 @@ DCamRetCode DMetadataProcessor::UpdateResultMetadata(bool &needReturn, } } ResizeMetadataHeader(latestConsumerResultMetadata_, itemCapacity, dataCapacity); - CameraStandard::CopyCameraMetadataItems(latestConsumerResultMetadata_, + Camera::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); needReturn = false; } } else if (ret1 == 0 || ret2 == 0) { ResizeMetadataHeader(latestConsumerResultMetadata_, itemCapacity, dataCapacity); - CameraStandard::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); + Camera::CopyCameraMetadataItems(latestConsumerResultMetadata_, latestProducerResultMetadata_); ConvertToCameraMetadata(latestConsumerResultMetadata_, result); needReturn = true; return SUCCESS; @@ -432,13 +432,13 @@ DCamRetCode DMetadataProcessor::SaveResultMetadata(std::string resultStr) return INVALID_ARGUMENT; } - latestProducerResultMetadata_ = CameraStandard::MetadataUtils::DecodeFromString(resultStr)->get(); + latestProducerResultMetadata_ = Camera::MetadataUtils::DecodeFromString(resultStr)->get(); if (latestProducerResultMetadata_ == nullptr) { DHLOGE("Failed to decode metadata setting from string."); return INVALID_ARGUMENT; } - if (!CameraStandard::GetCameraMetadataItemCount(latestProducerResultMetadata_)) { + if (!Camera::GetCameraMetadataItemCount(latestProducerResultMetadata_)) { DHLOGE("Input result metadata item is empty."); return INVALID_ARGUMENT; } @@ -447,9 +447,9 @@ DCamRetCode DMetadataProcessor::SaveResultMetadata(std::string resultStr) } void DMetadataProcessor::ConvertToCameraMetadata(common_metadata_header_t *&input, - std::shared_ptr &output) + std::shared_ptr &output) { - auto ret = CameraStandard::CopyCameraMetadataItems(output->get(), input); + auto ret = Camera::CopyCameraMetadataItems(output->get(), input); if (ret != CAM_META_SUCCESS) { DHLOGE("Failed to copy the old metadata to new metadata."); output = nullptr; @@ -462,7 +462,7 @@ void DMetadataProcessor::ResizeMetadataHeader(common_metadata_header_t *header, if (header) { header = nullptr; } - header = CameraStandard::AllocateCameraMetadataBuffer(itemCapacity, dataCapacity); + header = Camera::AllocateCameraMetadataBuffer(itemCapacity, dataCapacity); } uint32_t DMetadataProcessor::GetDataSize(uint32_t type) @@ -574,16 +574,16 @@ void DMetadataProcessor::PrintDCameraMetadata(const common_metadata_header_t *me return; } - uint32_t tagCount = CameraStandard::GetCameraMetadataItemCount(metadata); + uint32_t tagCount = Camera::GetCameraMetadataItemCount(metadata); DHLOGD("DMetadataProcessor::PrintDCameraMetadata, input metadata item count = %d.", tagCount); for (uint32_t i = 0; i < tagCount; i++) { camera_metadata_item_t item; - int ret = CameraStandard::GetCameraMetadataItem(metadata, i, &item); + int ret = Camera::GetCameraMetadataItem(metadata, i, &item); if (ret != 0) { continue; } - const char *name = CameraStandard::GetCameraMetadataItemName(item.item); + const char *name = Camera::GetCameraMetadataItemName(item.item); if (item.data_type == META_TYPE_BYTE) { for (size_t k = 0; k < item.count; k++) { DHLOGI("tag index:%d, name:%s, value:%d", item.index, name, (uint8_t)(item.data.u8[k])); diff --git a/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp b/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp index ff6b8783..85b3036d 100644 --- a/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp +++ b/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp @@ -30,7 +30,7 @@ DStreamOperator::DStreamOperator(std::shared_ptr &dMetadataP } CamRetCode DStreamOperator::IsStreamsSupported(OperationMode mode, - const std::shared_ptr &modeSetting, + const std::shared_ptr &modeSetting, const std::vector> &info, StreamSupportType &type) { @@ -136,7 +136,7 @@ CamRetCode DStreamOperator::ReleaseStreams(const std::vector& streamIds) } CamRetCode DStreamOperator::CommitStreams(OperationMode mode, - const std::shared_ptr& modeSetting) + const std::shared_ptr& modeSetting) { DHLOGI("DStreamOperator::CommitStreams, input operation mode=%d.", mode); if (IsCapturing()) { @@ -498,7 +498,7 @@ DCamRetCode DStreamOperator::ShutterBuffer(int streamId, const std::shared_ptr result = nullptr; + std::shared_ptr result = nullptr; DCamRetCode ret = dMetadataProcessor_->UpdateResultMetadata(needReturn, result); if (ret != DCamRetCode::SUCCESS) { DHLOGE("Cannot handle result metadata."); @@ -529,7 +529,7 @@ DCamRetCode DStreamOperator::SetCallBack(OHOS::sptr con DCamRetCode DStreamOperator::SetDeviceCallback( std::function &errorCbk, - std::function)> &resultCbk) + std::function)> &resultCbk) { errorCallback_ = errorCbk; resultCallback_ = resultCbk; @@ -677,7 +677,7 @@ std::shared_ptr DStreamOperator::BuildSuitableCaptureInfo(const s std::shared_ptr dcSetting = std::make_shared(); dcSetting->type_ = DCSettingsType::UPDATE_METADATA; - std::string settingStr = CameraStandard::MetadataUtils::EncodeToString(srcCaptureInfo->captureSetting_); + std::string settingStr = Camera::MetadataUtils::EncodeToString(srcCaptureInfo->captureSetting_); dcSetting->value_ = Base64Encode(reinterpret_cast(settingStr.c_str()), settingStr.length()); captureInfo->captureSettings_.push_back(dcSetting); diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn index f2f3cae0..6dc96ed0 100644 --- a/camera_hdf/hdi_impl/test/BUILD.gn +++ b/camera_hdf/hdi_impl/test/BUILD.gn @@ -52,7 +52,7 @@ ohos_executable("dcamera_hdi_sample") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", + "//drivers/peripheral/camera/interfaces/metadata/include", "${camera_hdf_path}/camera/interfaces/include", "${camera_hdf_path}/camera/interfaces/hdi_ipc", @@ -67,9 +67,9 @@ ohos_executable("dcamera_hdi_sample") { "${fwk_utils_path}:distributedhardwareutils", "${hdf_uhdf_path}/hdi:libhdi", "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//drivers/peripheral/display/hal:hdi_display_gralloc", "//foundation/graphic/standard/frameworks/surface:surface", - "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata", ] external_deps = [ diff --git a/camera_hdf/hdi_impl/test/common.cpp b/camera_hdf/hdi_impl/test/common.cpp index ec92151a..978af40b 100644 --- a/camera_hdf/hdi_impl/test/common.cpp +++ b/camera_hdf/hdi_impl/test/common.cpp @@ -144,7 +144,7 @@ void Test::GetCameraMetadata() } common_metadata_header_t* data = ability->get(); camera_metadata_item_t entry; - int ret = CameraStandard::FindCameraMetadataItem(data, OHOS_CONTROL_AE_AVAILABLE_MODES, &entry); + int ret = Camera::FindCameraMetadataItem(data, OHOS_CONTROL_AE_AVAILABLE_MODES, &entry); if (ret == 0) { std::cout << "==========[test log] get OHOS_CONTROL_AE_AVAILABLE_MODES success" << std::endl; } diff --git a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn index 7eccc9ea..a03a0b48 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn @@ -38,7 +38,7 @@ ohos_shared_library("distributed_camera_hdf_client") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", + "//drivers/peripheral/camera/interfaces/metadata/include", ] cflags = [ @@ -69,9 +69,9 @@ ohos_shared_library("distributed_camera_hdf_client") { deps = [ "${fwk_utils_path}:distributedhardwareutils", "${hdf_uhdf_path}/hdi:libhdi", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//drivers/peripheral/display/hal:hdi_display_gralloc", "//foundation/graphic/standard/frameworks/surface:surface", - "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata", "//utils/native/base:utils", ] diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp index 83835244..27a10ac9 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.cpp @@ -23,7 +23,7 @@ void DCameraDeviceCallback::OnError(ErrorType type, int32_t errorMsg) DHLOGW("DCameraDeviceCallback::OnError enter."); } -void DCameraDeviceCallback::OnResult(uint64_t timestamp, const std::shared_ptr &result) +void DCameraDeviceCallback::OnResult(uint64_t timestamp, const std::shared_ptr &result) { DHLOGW("DCameraDeviceCallback::OnResult enter."); } diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.h b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.h index c9bad27a..e1843318 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.h +++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback.h @@ -28,7 +28,7 @@ public: public: virtual void OnError(ErrorType type, int32_t errorMsg) override; - virtual void OnResult(uint64_t timestamp, const std::shared_ptr &result) override; + virtual void OnResult(uint64_t timestamp, const std::shared_ptr &result) override; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp index c58e6575..882f567e 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp @@ -48,8 +48,8 @@ int32_t DCameraDeviceCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel } uint64_t timestamp = data.ReadUint64(); - std::shared_ptr result = nullptr; - CameraStandard::MetadataUtils::DecodeCameraMetadata(data, result); + std::shared_ptr result = nullptr; + Camera::MetadataUtils::DecodeCameraMetadata(data, result); DHLOGI("DCameraDeviceCallbackStub::OnResult entry."); OnResult(timestamp, result); break; diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp index aee3de1a..5a79ccea 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp @@ -77,7 +77,7 @@ CamRetCode DCameraDeviceProxy::UpdateSettings(const std::shared_ptr(reply.ReadInt32()); if (retCode == CamRetCode::NO_ERROR) { - CameraStandard::MetadataUtils::DecodeCameraMetadata(reply, ability); + Camera::MetadataUtils::DecodeCameraMetadata(reply, ability); } return retCode; } diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp index 68fad50d..5fcad6dd 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp +++ b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp @@ -29,7 +29,7 @@ namespace OHOS { namespace DistributedHardware { CamRetCode DStreamOperatorProxy::IsStreamsSupported(OperationMode mode, - const std::shared_ptr &modeSetting, + const std::shared_ptr &modeSetting, const std::vector> &info, StreamSupportType &type) { @@ -53,7 +53,7 @@ CamRetCode DStreamOperatorProxy::IsStreamsSupported(OperationMode mode, return CamRetCode::INVALID_ARGUMENT; } - if (nullFlag && !CameraStandard::MetadataUtils::EncodeCameraMetadata(modeSetting, data)) { + if (nullFlag && !Camera::MetadataUtils::EncodeCameraMetadata(modeSetting, data)) { DHLOGE("Write metadata failed."); return CamRetCode::INVALID_ARGUMENT; } @@ -150,7 +150,7 @@ CamRetCode DStreamOperatorProxy::ReleaseStreams(const std::vector &streamId } CamRetCode DStreamOperatorProxy::CommitStreams(OperationMode mode, - const std::shared_ptr &modeSetting) + const std::shared_ptr &modeSetting) { MessageParcel data; MessageParcel reply; @@ -166,7 +166,7 @@ CamRetCode DStreamOperatorProxy::CommitStreams(OperationMode mode, return CamRetCode::INVALID_ARGUMENT; } - bool bRet = CameraStandard::MetadataUtils::EncodeCameraMetadata(modeSetting, data); + bool bRet = Camera::MetadataUtils::EncodeCameraMetadata(modeSetting, data); if (!bRet) { DHLOGE("Write metadata failed."); return CamRetCode::INVALID_ARGUMENT; @@ -294,7 +294,7 @@ CamRetCode DStreamOperatorProxy::Capture(int captureId, return CamRetCode::INVALID_ARGUMENT; } - bool bRet = CameraStandard::MetadataUtils::EncodeCameraMetadata(info->captureSetting_, data); + bool bRet = Camera::MetadataUtils::EncodeCameraMetadata(info->captureSetting_, data); if (!bRet) { DHLOGE("Write metadata failed."); return CamRetCode::INVALID_ARGUMENT; diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h index 11843db6..7398eca7 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.h @@ -28,13 +28,13 @@ public: virtual ~DStreamOperatorProxy() = default; virtual CamRetCode IsStreamsSupported(OperationMode mode, - const std::shared_ptr &modeSetting, + const std::shared_ptr &modeSetting, const std::vector> &info, StreamSupportType &type) override; virtual CamRetCode CreateStreams(const std::vector> &streamInfos) override; virtual CamRetCode ReleaseStreams(const std::vector &streamIds) override; virtual CamRetCode CommitStreams(OperationMode mode, - const std::shared_ptr &modeSetting) override; + const std::shared_ptr &modeSetting) override; virtual CamRetCode GetStreamAttributes(std::vector> &attributes) override; virtual CamRetCode AttachBufferQueue(int streamId, const OHOS::sptr &producer) override; diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn index 6e740670..9ef5242f 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -44,7 +44,7 @@ ohos_shared_library("distributed_camera_host_config") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", + "//drivers/peripheral/camera/interfaces/metadata/include", ] sources = [ "dcamera_host_config.cpp" ] diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn index e011decc..c0f645a9 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn @@ -39,7 +39,7 @@ ohos_shared_library("distributed_camera_provider_config") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", + "//drivers/peripheral/camera/interfaces/metadata/include", ] sources = [ "dcamera_provider_config.cpp" ] diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp index f7d79965..8a47104d 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp @@ -53,7 +53,7 @@ void DCameraDeviceCallbackProxy::OnError(ErrorType type, int32_t errorMsg) } void DCameraDeviceCallbackProxy::OnResult(uint64_t timestamp, - const std::shared_ptr &result) + const std::shared_ptr &result) { MessageParcel data; MessageParcel reply; @@ -73,7 +73,7 @@ void DCameraDeviceCallbackProxy::OnResult(uint64_t timestamp, return; } - if (!CameraStandard::MetadataUtils::EncodeCameraMetadata(result, data)) { + if (!Camera::MetadataUtils::EncodeCameraMetadata(result, data)) { DHLOGE("Write metadata failed."); return; } diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h index 76112868..505feda0 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h +++ b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.h @@ -30,7 +30,7 @@ public: virtual ~DCameraDeviceCallbackProxy() = default; virtual void OnError(ErrorType type, int32_t errorMsg) override; - virtual void OnResult(uint64_t timestamp, const std::shared_ptr &result) override; + virtual void OnResult(uint64_t timestamp, const std::shared_ptr &result) override; private: static inline BrokerDelegator delegator_; diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp index d9ed4521..a1964d18 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp @@ -115,8 +115,8 @@ int32_t DCameraDeviceStub::DCDeviceStubUpdateSettings(MessageParcel& data, Messa return HDF_FAILURE; } - std::shared_ptr metadata = nullptr; - CameraStandard::MetadataUtils::DecodeCameraMetadata(data, metadata); + std::shared_ptr metadata = nullptr; + Camera::MetadataUtils::DecodeCameraMetadata(data, metadata); CamRetCode ret = UpdateSettings(metadata); if (!reply.WriteInt32(static_cast(ret))) { diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp index 96e4efbf..e7566368 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp @@ -111,7 +111,7 @@ int32_t DCameraHostStub::DCHostStubGetCameraAbility(MessageParcel &data, Message } if (ret == CamRetCode::NO_ERROR) { - bool bRet = CameraStandard::MetadataUtils::EncodeCameraMetadata(ability, reply); + bool bRet = Camera::MetadataUtils::EncodeCameraMetadata(ability, reply); if (!bRet) { DHLOGE("Write ability failed."); return HDF_FAILURE; diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp index 11837271..284af701 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp @@ -89,10 +89,10 @@ int32_t DStreamOperatorStub::DStreamOperatorStubIsStreamsSupported(MessageParcel OperationMode operationMode = static_cast(data.ReadInt32()); - std::shared_ptr metadata = nullptr; + std::shared_ptr metadata = nullptr; bool nullFlag = data.ReadBool(); if (nullFlag) { - CameraStandard::MetadataUtils::DecodeCameraMetadata(data, metadata); + Camera::MetadataUtils::DecodeCameraMetadata(data, metadata); } int32_t count = data.ReadInt32(); @@ -176,8 +176,8 @@ int32_t DStreamOperatorStub::DStreamOperatorStubCommitStreams(MessageParcel &dat OperationMode mode = static_cast(data.ReadInt32()); - std::shared_ptr metadata = nullptr; - CameraStandard::MetadataUtils::DecodeCameraMetadata(data, metadata); + std::shared_ptr metadata = nullptr; + Camera::MetadataUtils::DecodeCameraMetadata(data, metadata); CamRetCode ret = CommitStreams(mode, metadata); if (!reply.WriteInt32(static_cast(ret))) { @@ -274,8 +274,8 @@ int32_t DStreamOperatorStub::DStreamOperatorStubCapture(MessageParcel &data, Mes return HDF_FAILURE; } - std::shared_ptr metadata = nullptr; - CameraStandard::MetadataUtils::DecodeCameraMetadata(data, metadata); + std::shared_ptr metadata = nullptr; + Camera::MetadataUtils::DecodeCameraMetadata(data, metadata); bool enableShutterCallback = data.ReadBool(); std::shared_ptr pInfo = std::make_shared(); diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index d9f0a56c..8bc4f661 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -18,10 +18,10 @@ import( ohos_shared_library("distributed_camera_client") { include_dirs = [ + "//drivers/peripheral/camera/interfaces/metadata/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", - "${camerastandard_path}/frameworks/native/metadata/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", @@ -72,10 +72,10 @@ ohos_shared_library("distributed_camera_client") { deps = [ "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}:libsurface", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/services/cameraservice/cameraoperator/client/include/dcamera_client.h b/services/cameraservice/cameraoperator/client/include/dcamera_client.h index 1eb348ab..712d7544 100644 --- a/services/cameraservice/cameraoperator/client/include/dcamera_client.h +++ b/services/cameraservice/cameraoperator/client/include/dcamera_client.h @@ -55,7 +55,7 @@ private: int32_t StartCaptureInner(std::shared_ptr& info); int32_t StartPhotoOutput(std::shared_ptr& info); int32_t StartVideoOutput(); - void SetQualityAndGpsLocation(const std::shared_ptr& cameraMetadata, + void SetQualityAndGpsLocation(const std::shared_ptr& cameraMetadata, std::shared_ptr& photoCaptureSettings); bool isInit_; diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp index 94722132..ca6002be 100644 --- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp +++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp @@ -429,9 +429,9 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf camera_metadata_item_t item; CameraStandard::PhotoCaptureSetting::RotationConfig rotation = CameraStandard::PhotoCaptureSetting::RotationConfig::Rotation_0; - std::shared_ptr cameraMetadata = - CameraStandard::MetadataUtils::DecodeFromString(Base64Decode(metadataSetting)); - int32_t ret = CameraStandard::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_ORIENTATION, &item); + std::shared_ptr cameraMetadata = + Camera::MetadataUtils::DecodeFromString(Base64Decode(metadataSetting)); + int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_ORIENTATION, &item); if (ret == DCAMERA_OK) { DHLOGI("DCameraClient::StartPhotoOutput %s find camera metadata item", GetAnonyString(cameraId_).c_str()); rotation = static_cast(item.data.i32[0]); @@ -452,11 +452,11 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf return DCAMERA_OK; } -void DCameraClient::SetQualityAndGpsLocation(const std::shared_ptr& cameraMetadata, +void DCameraClient::SetQualityAndGpsLocation(const std::shared_ptr& cameraMetadata, std::shared_ptr& photoCaptureSettings) { camera_metadata_item_t item; - int32_t ret = CameraStandard::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_QUALITY, &item); + int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_QUALITY, &item); if (ret == CAM_META_SUCCESS) { DHLOGI("DCameraClient::SetQualityAndGpsLocation %s find camera quality item", GetAnonyString(cameraId_).c_str()); @@ -466,7 +466,7 @@ void DCameraClient::SetQualityAndGpsLocation(const std::shared_ptrSetQuality(quality); } - ret = CameraStandard::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_GPS_COORDINATES, &item); + ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_GPS_COORDINATES, &item); if (ret == CAM_META_SUCCESS) { DHLOGI("DCameraClient::SetQualityAndGpsLocation %s find camera gpsCoordinates item", GetAnonyString(cameraId_).c_str()); 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 bd274475..7d6f4c6b 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -20,11 +20,11 @@ module_out_path = "distributed_camera/dcamera_client_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//drivers/peripheral/camera/interfaces/metadata/include", "//third_party/jsoncpp/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", - "${camerastandard_path}/frameworks/native/metadata/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", @@ -60,13 +60,13 @@ ohos_unittest("DCameraClientTest") { deps = [ "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}:libsurface", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 006dd616..601f0ead 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -18,11 +18,11 @@ import( ohos_shared_library("distributed_camera_handler") { include_dirs = [ + "//drivers/peripheral/camera/interfaces/metadata/include", "//third_party/jsoncpp/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", - "${camerastandard_path}/frameworks/native/metadata/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", @@ -56,10 +56,10 @@ ohos_shared_library("distributed_camera_handler") { deps = [ "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}:libsurface", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] 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 17312387..2c85f11b 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -12,16 +12,18 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + module_out_path = "distributed_camera/dcamera_handler_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ + "//drivers/peripheral/camera/interfaces/metadata/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "${graphicstandard_path}/frameworks/surface/include", - "${camerastandard_path}/frameworks/native/metadata/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", @@ -49,27 +51,25 @@ config("module_private_config") { ohos_unittest("DCameraHandlerTest") { module_out_path = module_out_path - sources = [ - "dcamera_handler_test.cpp" - ] + sources = [ "dcamera_handler_test.cpp" ] configs = [ ":module_private_config" ] deps = [ - "//third_party/googletest:gtest_main", - "//third_party/jsoncpp:jsoncpp", - "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", + "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", + "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}:libsurface", - "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", + "//drivers/peripheral/camera/interfaces/metadata:metadata", + "//third_party/googletest:gtest_main", + "//third_party/jsoncpp:jsoncpp", + "//utils/native/base:utils", ] external_deps = [ - "hiviewdfx_hilog_native:libhilog", "eventhandler:libeventhandler", + "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", ] diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 7a27e231..ca6b9c48 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -20,8 +20,8 @@ ohos_shared_library("distributed_camera_sink") { include_dirs = [ "//utils/native/base/include", "//utils/system/safwk/native/include", + "//drivers/peripheral/camera/interfaces/metadata/include", "${graphicstandard_path}/frameworks/surface/include", - "${camerastandard_path}/frameworks/native/metadata/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", @@ -98,7 +98,6 @@ ohos_shared_library("distributed_camera_sink") { deps = [ "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}:libsurface", @@ -106,6 +105,7 @@ ohos_shared_library("distributed_camera_sink") { "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/channel:distributed_camera_channel", "${services_path}/data_process:distributed_camera_data_process", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index a1763fc1..36fc2334 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "${graphicstandard_path}/frameworks/surface/include", - "${camerastandard_path}/frameworks/native/metadata/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include", "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", @@ -56,6 +55,7 @@ config("module_private_config") { "${fwk_common_path}/log/include", "//drivers/peripheral/base", + "//drivers/peripheral/camera/interfaces/metadata/include", ] } @@ -74,13 +74,13 @@ ohos_unittest("DCameraSinkMgrTest") { deps = [ "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "${graphicstandard_path}:libsurface", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", "${services_path}/channel:distributed_camera_channel", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] -- Gitee