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