|
|
|
@ -101,12 +101,14 @@ hardware::camera2::params::OutputConfiguration convertFromHidl(
|
|
|
|
|
bool convertFromHidl(const HCameraMetadata &src, CameraMetadata *dst) {
|
|
|
|
|
const camera_metadata_t *buffer = reinterpret_cast<const camera_metadata_t*>(src.data());
|
|
|
|
|
size_t expectedSize = src.size();
|
|
|
|
|
int res = validate_camera_metadata_structure(buffer, &expectedSize);
|
|
|
|
|
if (res == OK || res == CAMERA_METADATA_VALIDATION_SHIFTED) {
|
|
|
|
|
*dst = buffer;
|
|
|
|
|
} else {
|
|
|
|
|
ALOGE("%s: Malformed camera metadata received from HAL", __FUNCTION__);
|
|
|
|
|
return false;
|
|
|
|
|
if (buffer != nullptr) {
|
|
|
|
|
int res = validate_camera_metadata_structure(buffer, &expectedSize);
|
|
|
|
|
if (res == OK || res == CAMERA_METADATA_VALIDATION_SHIFTED) {
|
|
|
|
|
*dst = buffer;
|
|
|
|
|
} else {
|
|
|
|
|
ALOGE("%s: Malformed camera metadata received from HAL", __FUNCTION__);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|