diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp index 798260b9d16ebe3f90635fbf71ee67b87009fa91..c2f351d856e483d432e4b221decc8d7a6c9f9a2d 100644 --- a/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp +++ b/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp @@ -17,7 +17,6 @@ #include "anonymous_string.h" #include "camera_util.h" -#include "camera_metadata_operator.h" #include "dcamera_input_callback.h" #include "dcamera_manager_callback.h" #include "dcamera_photo_callback.h" @@ -100,13 +99,12 @@ int32_t DCameraClient::UpdateSettings(std::vectorvalue_; std::string metadataStr = Base64Decode(dcSettingValue); - FindCameraMetadata(metadataStr); if (cameraInput_ == nullptr) { DHLOGE("DCameraClientCommon::UpdateSettings %s cameraInput is null", GetAnonyString(cameraId_).c_str()); UpdateSettingCache(metadataStr); - return DCAMERA_OK; + return DCAMERA_BAD_VALUE; } int32_t ret = ((sptr &)cameraInput_)->SetCameraSettings(metadataStr); @@ -129,43 +127,12 @@ int32_t DCameraClient::UpdateSettings(std::vector cameraMetadata = Camera::MetadataUtils::DecodeFromString(metadataStr); - camera_metadata_item_t focusItem; - int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_FOCUS_MODE, &focusItem); - if (ret == CAM_META_SUCCESS) { - DHLOGI("DCameraClientCommon::FindCameraMetadata focus mode: %d", focusItem.data.u8[0]); - } else { - DHLOGE("DCameraClientCommon::FindCameraMetadata %s find focus mode failed, ret: %d", - GetAnonyString(cameraId_).c_str(), ret); - } - - camera_metadata_item_t exposureItem; - ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_EXPOSURE_MODE, &exposureItem); - if (ret == CAM_META_SUCCESS) { - DHLOGI("DCameraClientCommon::FindCameraMetadata exposure mode: %d", exposureItem.data.u8[0]); - } else { - DHLOGE("DCameraClientCommon::FindCameraMetadata %s find exposure mode failed, ret: %d", - GetAnonyString(cameraId_).c_str(), ret); - } - - camera_metadata_item_t stabilityItem; - ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &stabilityItem); - if (ret == CAM_META_SUCCESS) { - DHLOGI("DCameraClientCommon::FindCameraMetadata stabilization mode: %d", stabilityItem.data.u8[0]); - } else { - DHLOGE("DCameraClientCommon::FindCameraMetadata %s find stabilization mode failed, ret: %d", - GetAnonyString(cameraId_).c_str(), ret); - } + DHLOGI("DCameraClient::FindCameraMetadata cameraId: %s", GetAnonyString(cameraId_).c_str()); } int32_t DCameraClient::StartCapture(std::vector>& captureInfos) @@ -298,18 +265,6 @@ int32_t DCameraClient::ConfigCaptureSession(std::vector &)cameraInput_)->SetErrorCallback(inputCallback); ((sptr &)cameraInput_)->SetFocusCallback(inputCallback); - while (!cameraMetadatas_.empty()) { - std::string metadataStr = cameraMetadatas_.front(); - FindCameraMetadata(metadataStr); - int32_t ret = ((sptr &)cameraInput_)->SetCameraSettings(metadataStr); - if (ret != DCAMERA_OK) { - DHLOGE("DCameraClientCommon::ConfigCaptureSession %s set camera settings failed, ret: %d", - GetAnonyString(cameraId_).c_str(), ret); - return ret; - } - cameraMetadatas_.pop(); - } - captureSession_ = cameraManager_->CreateCaptureSession(); if (captureSession_ == nullptr) { DHLOGE("DCameraClientCommon::ConfigCaptureSession %s create captureSession failed", @@ -477,36 +432,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf DHLOGE("DCameraClientCommon::StartPhotoOutput photoOutput is null"); return DCAMERA_BAD_VALUE; } - - std::vector> captureSettings = info->captureSettings_; - std::string metadataSetting; - for (auto& setting : captureSettings) { - if (setting->type_ == UPDATE_METADATA) { - DHLOGI("DCameraClientCommon::StartPhotoOutput %s update metadata settings", - GetAnonyString(cameraId_).c_str()); - metadataSetting = setting->value_; - } - } - - if (metadataSetting.empty()) { - DHLOGE("DCameraClientCommon::StartPhotoOutput no metadata settings to update"); - int32_t ret = ((sptr &)photoOutput_)->Capture(); - if (ret != DCAMERA_OK) { - DHLOGE("DCameraClientCommon::StartPhotoOutput %s photoOutput capture failed, ret: %d", - GetAnonyString(cameraId_).c_str(), ret); - return ret; - } - return DCAMERA_OK; - } - - std::string metadataStr = Base64Decode(metadataSetting); - std::shared_ptr cameraMetadata = Camera::MetadataUtils::DecodeFromString(metadataStr); - std::shared_ptr photoCaptureSetting = - std::make_shared(); - SetPhotoCaptureRotation(cameraMetadata, photoCaptureSetting); - SetPhotoCaptureQuality(cameraMetadata, photoCaptureSetting); - SetPhotoCaptureLocation(cameraMetadata, photoCaptureSetting); - int32_t ret = ((sptr &)photoOutput_)->Capture(photoCaptureSetting); + int32_t ret = ((sptr &)photoOutput_)->Capture(); if (ret != DCAMERA_OK) { DHLOGE("DCameraClientCommon::StartPhotoOutput %s photoOutput capture failed, ret: %d", GetAnonyString(cameraId_).c_str(), ret); @@ -518,52 +444,19 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf void DCameraClient::SetPhotoCaptureRotation(const std::shared_ptr& cameraMetadata, std::shared_ptr& photoCaptureSetting) { - uint32_t rotationCount = 1; - camera_metadata_item_t item; - int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_ORIENTATION, &item); - if ((ret == CAM_META_SUCCESS) && (rotationCount == item.count)) { - CameraStandard::PhotoCaptureSetting::RotationConfig rotation = - static_cast(item.data.i32[0]); - photoCaptureSetting->SetRotation(rotation); - DHLOGI("DCameraClientCommon::SetPhotoCaptureRotation %s photo capture settings set %d rotation: %d", - GetAnonyString(cameraId_).c_str(), item.count, rotation); - } + DHLOGI("DCameraClientCommon::SetPhotoCaptureRotation cameraId: %s", GetAnonyString(cameraId_).c_str()); } void DCameraClient::SetPhotoCaptureQuality(const std::shared_ptr& cameraMetadata, std::shared_ptr& photoCaptureSetting) { - uint32_t qualityCount = 1; - camera_metadata_item_t item; - int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_QUALITY, &item); - if ((ret == CAM_META_SUCCESS) && (qualityCount == item.count)) { - CameraStandard::PhotoCaptureSetting::QualityLevel quality = - static_cast(item.data.u8[0]); - photoCaptureSetting->SetQuality(quality); - DHLOGI("DCameraClientCommon::SetPhotoCaptureQuality %s photo capture settings set %d quality: %d", - GetAnonyString(cameraId_).c_str(), item.count, quality); - } + DHLOGI("DCameraClientCommon::SetPhotoCaptureQuality cameraId: %s", GetAnonyString(cameraId_).c_str()); } void DCameraClient::SetPhotoCaptureLocation(const std::shared_ptr& cameraMetadata, std::shared_ptr& photoCaptureSetting) { - uint32_t locationCount = 3; - camera_metadata_item_t item; - int32_t ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_JPEG_GPS_COORDINATES, &item); - if ((ret == CAM_META_SUCCESS) && (locationCount == item.count)) { - int32_t latitudeIndex = 0; - int32_t longitudeIndex = 1; - int32_t altitudeIndex = 2; - std::unique_ptr location = std::make_unique(); - location->latitude = item.data.d[latitudeIndex]; - location->longitude = item.data.d[longitudeIndex]; - location->altitude = item.data.d[altitudeIndex]; - photoCaptureSetting->SetLocation(location); - DHLOGI("DCameraClientCommon::SetPhotoCaptureLocation %s photo capture settings set %d location: " + - "latitude=%f, longitude=%f, altitude=%f", GetAnonyString(cameraId_).c_str(), item.count, - item.data.d[latitudeIndex], item.data.d[longitudeIndex], item.data.d[altitudeIndex]); - } + DHLOGI("DCameraClientCommon::SetPhotoCaptureLocation cameraId: %s", GetAnonyString(cameraId_).c_str()); } int32_t DCameraClient::StartVideoOutput()