diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index 0be318069e8e0bb95d4909fe67b6b82026e35a0f..a68ae4030bee1a90e97ae1ea6d6905e593a69505 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", ] sources = [ @@ -96,9 +96,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 c434ae6aab3a0e7e801865bbe61d9dd6477dd927..470200f7ab7089c262960586e2a75adc2e4e149b 100644 --- a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h +++ b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h @@ -50,7 +50,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: @@ -59,7 +59,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 3885d5033f23cb3cbba5d465b3856026652e1f45..72a074166914592b8ecd8ca5ebd74c118d964806 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: @@ -87,7 +87,7 @@ private: std::shared_ptr dMetadataProcessor_; OHOS::sptr dcStreamOperatorCallback_; function errorCallback_; - function)> resultCallback_; + function)> resultCallback_; std::shared_ptr dhBase_; std::vector dcSupportedCodecType_; @@ -105,7 +105,7 @@ private: bool isCapturing_ = false; std::mutex isCapturingLock_; OperationMode currentOperMode_ = OperationMode::NORMAL; - std::shared_ptr latestStreamSetting_; + std::shared_ptr latestStreamSetting_; }; } // end namespace DistributedHardware } // end 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 7d602127bcfc1453a3077733a15aa85c8491e5cd..df90ee6405c493de6c82ae4dfa8b9f5fd52e9a37 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 44fa7a12ce74549f2558bf4387bf029a44dce093..cf8950b8d70e7139ae469a6d01364102b5c426b9 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp @@ -34,7 +34,7 @@ DCamRetCode DMetadataProcessor::InitDCameraAbility(const std::string &abilityInf if (rootValue.isMember("MetaData") && rootValue["MetaData"].isString()) { std::string metadataStr = rootValue["MetaData"].asString(); if (!metadataStr.empty()) { - dCameraAbility_ = CameraStandard::MetadataUtils::DecodeFromString(Base64Decode(metadataStr)); + dCameraAbility_ = Camera::MetadataUtils::DecodeFromString(metadataStr); DHLOGI("Decode distributed camera metadata from string success."); } } @@ -45,7 +45,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."); @@ -61,7 +61,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)); @@ -243,7 +243,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 %d failed.", tag); @@ -261,7 +261,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 %d failed.", tag); @@ -357,19 +357,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; @@ -377,12 +377,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; @@ -392,7 +392,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; @@ -400,13 +400,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; @@ -423,13 +423,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; } @@ -438,9 +438,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; @@ -453,7 +453,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) @@ -565,16 +565,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 21af8d7640b6d29ab9d715628463aaed5850e0f9..0ac47c017764b045f004950966418bfcde811c59 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()) { @@ -496,7 +496,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."); @@ -527,7 +527,7 @@ DCamRetCode DStreamOperator::SetCallBack(OHOS::sptr con DCamRetCode DStreamOperator::SetDeviceCallback( std::function &errorCbk, - std::function)> &resultCbk) + std::function)> &resultCbk) { errorCallback_ = errorCbk; resultCallback_ = resultCbk; @@ -654,7 +654,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 0a0bf5eeae38f894bedde263da01d0a280d1f6ce..698101b96adc169f4e23091a1ad2c6d35ef23d02 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", "${innerkits_path}/native_cpp/camera_source/include", "${innerkits_path}/native_cpp/camera_source/include/callback", @@ -80,9 +80,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 178d893b1d7f8ca7ccc5a8152491282e87ebbba2..3b6d40b45d087f05e3dbc1f4f20474a8d3193cc2 100644 --- a/camera_hdf/hdi_impl/test/common.cpp +++ b/camera_hdf/hdi_impl/test/common.cpp @@ -135,7 +135,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 71944d5d759091260bf3c2294d98db813e869f52..0f2ea0f5d1e135ab561f7076c042b0d48333c76e 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn @@ -36,7 +36,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 = [ @@ -73,9 +73,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 935a83edb6989d9a9f95aaee8a7d875060d3b740..80eed54a62de7c47045f6df4d9b0b0fa5cb81e5f 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 ec4081c9dc2262bed2abdc9d297659957aa78d07..73b7ffa6df71d459948e67ce74cc87b6d911938e 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; }; } // end namespace DistributedHardware } // end 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 a72665e478dcec5d990e885b1bb0ef99d731b4ec..ab1426cd1ad601eec52ad0759c4b87898ddb15b7 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 @@ -50,8 +50,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 5f4dc2ed6d6289544e0a58d3f22fa8f3cab42d14..639932a8f524c188381c4a6251da9e56cb841a0d 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 @@ -78,7 +78,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 c30915d235cada788dfca394266683ad757b7b7b..541ba2959423361715e192cf36eb89c067fbfa91 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 @@ -30,7 +30,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) { @@ -54,7 +54,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; } @@ -151,7 +151,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; @@ -167,7 +167,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; @@ -295,7 +295,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 340b6cac13807e126985a4d6d565b6dfa96bbf3a..cd0d4d9e270972864a36ad79bad648b74c1d0431 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 d3ec5b0d6783509ae862e4392953df9385a0234a..aa591b0095dd09b71270bead8421e39200d8e191 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -42,7 +42,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", ] cflags = [ diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn index 053ddc2b1ffe48eaf26cc63429827d5584bfb409..08b489001246b78c3558a7add0daccae335e289a 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn @@ -37,7 +37,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", ] cflags = [ 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 44b7e8349be06930499af0a7eeaf1001ddde1c08..bc18ee1ec7dd2ec6e0ce4c388735c9b9425ec9cd 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 @@ -54,7 +54,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; @@ -74,7 +74,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 764feb4a1e642109de1a602dae0ea93d6e5b38ab..29cde0141db88a240187089b9e1e2122b530a722 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 f2691921e683edfae4685c41ca3def1abc0ea188..cc497af4014c92f5de59733f12a63fb71a3c75c8 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 @@ -116,8 +116,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 32eadba3e4796f43239ab21703533a68b9babb2f..39ad345f929531808190bdc5310b13babc8f1822 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 @@ -112,7 +112,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 8a3132b9bd21c246f964766c03487fbed8a19d9a..c671a5c086081492e1cadae5496e5657577584fa 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 @@ -90,10 +90,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(); @@ -177,8 +177,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))) { @@ -275,8 +275,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 9dece470da7a2af798544ac6f95e4a0de0dff04e..300a64f1dcee5fc2f96620d2a3fae07e193a0329 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -17,10 +17,10 @@ import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni 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", @@ -74,7 +74,7 @@ ohos_shared_library("distributed_camera_client") { "${common_path}:distributed_camera_utils", "${graphicstandard_path}:libsurface", "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp index e52b396661f3f4f80819086408c7166fe3accf3e..8f23da00428ff54c3616ef7b5a6ddb7f9a418caf 100644 --- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp +++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp @@ -396,9 +396,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]); 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 46082450f4b37f93f55ed69635e144ee6ce788c1..f31c22e87b04d22b4df02ead76f338925610d71d 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -18,11 +18,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", @@ -65,9 +65,9 @@ ohos_unittest("DCameraClientTest") { "${common_path}:distributed_camera_utils", "${graphicstandard_path}:libsurface", "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/sinkservice:distributed_camera_sink" + "//drivers/peripheral/camera/interfaces/metadata:metadata", ] external_deps = [ diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 5fce97373774a32ddeef7bdd04c8465f037f34b4..b2e5d26efcf58161a6f9089095ff787eb70fe21d 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -17,11 +17,11 @@ import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni 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", @@ -60,7 +60,7 @@ ohos_shared_library("distributed_camera_handler") { "${common_path}:distributed_camera_utils", "${graphicstandard_path}:libsurface", "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//utils/native/base:utils", "//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 17312387712b5374119920f2b848de3028011b4e..5c69c908680cf0a99aa1220cf3830cfa042c5e93 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -18,10 +18,10 @@ 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", @@ -63,8 +63,8 @@ ohos_unittest("DCameraHandlerTest") { "${common_path}:distributed_camera_utils", "${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", ] external_deps = [ diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index add527a3598c9ddd57a679e3598ee61f2a16b4d3..03d54f95807c5b3260859bd15f2e1cc0d0c11843 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -19,8 +19,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", @@ -108,12 +108,11 @@ ohos_shared_library("distributed_camera_sink") { "${common_path}:distributed_camera_utils", "${graphicstandard_path}:libsurface", "${camerastandard_path}/frameworks/native/camera:camera_framework", - "${camerastandard_path}/frameworks/native/metadata:metadata", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/cameraoperator/handler:distributed_camera_handler", "${services_path}/channel:distributed_camera_channel", "${services_path}/data_process:distributed_camera_data_process", - "//utils/native/base:utils", + "//drivers/peripheral/camera/interfaces/metadata:metadata", "//third_party/jsoncpp:jsoncpp", ] diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 2e69ad446a099d88692622738040c63cad698eec..7a5f048c14b7e3eded5987c2efc3ed36ee25be0e 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 = [ + "//drivers/peripheral/camera/interfaces/metadata/include", "${services_path}/cameraservice/sinkservice/include/distributedcamera", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", @@ -41,6 +42,7 @@ ohos_unittest("DistributedCameraSinkServiceTest") { deps = [ "${services_path}/cameraservice/sinkservice:distributed_camera_sink", + "//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 e3d10be35f66ef300e67d6c3fc41dc9820708e29..da8e71133b6ee58c62e45847a98c1a23a749d0a3 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -44,6 +44,7 @@ config("module_private_config") { "${fwk_common_path}/log/include", "//drivers/peripheral/base", + "//drivers/peripheral/camera/interfaces/metadata/include", ] } @@ -65,6 +66,7 @@ ohos_unittest("DCameraSinkMgrTest") { "${fwk_utils_path}:distributedhardwareutils", "${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", ]