diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp
index 90a36eb2ae68e53461b54d1cdd05392a37c0fd61..4a764de9d58e7de1709d76d305a12a4e1cb7cf3f 100644
--- a/camera/metadata/src/camera_metadata_info.cpp
+++ b/camera/metadata/src/camera_metadata_info.cpp
@@ -1403,7 +1403,7 @@ std::string CameraMetadata::MetadataItemDump(const common_metadata_header_t *met
int ret = FindCameraMetadataItem(metadataHeader, item, &entry);
if (ret != 0) {
- METADATA_ERR_LOG("get item error and item = %{public}d", item);
+ METADATA_ERR_LOG("get item error and item = %{public}u", item);
return st;
}
@@ -1430,7 +1430,7 @@ std::string CameraMetadata::MetadataItemDump(const common_metadata_header_t *met
st = RationalItemToString(item, entry);
break;
default:
- METADATA_ERR_LOG("invalid param and item = %{public}d", item);
+ METADATA_ERR_LOG("invalid param and item = %{public}u", item);
break;
}
diff --git a/camera/v1_3/ICameraDevice.idl b/camera/v1_3/ICameraDevice.idl
index 29d1f25311658128ff8df3d844a1b6a34e6b4487..fe92417d1a8462caa992e4800ba515808bedce93 100644
--- a/camera/v1_3/ICameraDevice.idl
+++ b/camera/v1_3/ICameraDevice.idl
@@ -27,7 +27,6 @@ package ohos.hdi.camera.v1_3;
import ohos.hdi.camera.v1_2.ICameraDevice;
import ohos.hdi.camera.v1_3.IStreamOperatorCallback;
import ohos.hdi.camera.v1_2.IStreamOperator;
-import ohos.hdi.camera.v1_3.Types;
interface ICameraDevice extends ohos.hdi.camera.v1_2.ICameraDevice {
/**
@@ -59,17 +58,4 @@ interface ICameraDevice extends ohos.hdi.camera.v1_2.ICameraDevice {
* @version 1.0
*/
GetSecureCameraSeq([out] unsigned long SeqId);
-
- /**
- * @brief Obtains the resourceCost of camera device.
- *
- * @param resourceCost Indicates the resources required to open this camera device.
- *
- * @return Returns NO_ERROR if the operation is successful; returns an error code defined
- * in {@link CamRetCode} otherwise.
- *
- * @since 5.0
- * @version 1.0
- */
- GetResourceCost([out] CameraDeviceResourceCost resourceCost);
}
diff --git a/camera/v1_3/ICameraHost.idl b/camera/v1_3/ICameraHost.idl
index e99b2f45dd1c01a762f94958c3b5ce0d727103d2..d526a887e009d0318f14456eb5569cee77786250 100644
--- a/camera/v1_3/ICameraHost.idl
+++ b/camera/v1_3/ICameraHost.idl
@@ -27,6 +27,7 @@ package ohos.hdi.camera.v1_3;
import ohos.hdi.camera.v1_2.ICameraHost;
import ohos.hdi.camera.v1_3.ICameraDevice;
import ohos.hdi.camera.v1_0.ICameraDeviceCallback;
+import ohos.hdi.camera.v1_3.Types;
interface ICameraHost extends ohos.hdi.camera.v1_2.ICameraHost {
/**
@@ -64,4 +65,18 @@ interface ICameraHost extends ohos.hdi.camera.v1_2.ICameraHost {
* @version 1.0
*/
OpenSecureCamera([in] String cameraId, [in] ICameraDeviceCallback callbackObj, [out] ICameraDevice device);
+
+ /**
+ * @brief Obtains the resourceCost of camera device.
+ *
+ * @param resourceCost Indicates the resources required to open this camera device.
+ * @param cameraId Indicates the ID of the camera device.
+ *
+ * @return Returns NO_ERROR if the operation is successful; returns an error code defined
+ * in {@link CamRetCode} otherwise.
+ *
+ * @since 5.0
+ * @version 1.0
+ */
+ GetResourceCost([in] String cameraId, [out] CameraDeviceResourceCost resourceCost);
}
diff --git a/camera/v1_3/Types.idl b/camera/v1_3/Types.idl
index db10548392e1af9d8e8ea09dce8039cea769c53f..3ea45f91875d18e258b1397146cf4770ecd5b6c8 100644
--- a/camera/v1_3/Types.idl
+++ b/camera/v1_3/Types.idl
@@ -122,11 +122,11 @@ enum OperationMode : ohos.hdi.camera.v1_2.OperationMode_V1_2 {
APERTURE_VIDEO = 20,
/**
- * flourscence photo mode, which dedicated to flourscence photo mode
+ * fluorescence photo mode, which dedicated to fluorescence photo mode
* @since 5.0
* @version 1.0
*/
- FLOURSCENCE_PHOTO = 21,
+ FLUORESCENCE_PHOTO = 21,
};
/**