@ -648,7 +648,7 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addDynamicDepthTags()
bool isDepthExclusivePresent = std : : find ( chTags . data . i32 , chTags . data . i32 + chTags . count ,
bool isDepthExclusivePresent = std : : find ( chTags . data . i32 , chTags . data . i32 + chTags . count ,
depthExclTag ) ! = ( chTags . data . i32 + chTags . count ) ;
depthExclTag ) ! = ( chTags . data . i32 + chTags . count ) ;
bool isDepthSizePresent = std : : find ( chTags . data . i32 , chTags . data . i32 + chTags . count ,
bool isDepthSizePresent = std : : find ( chTags . data . i32 , chTags . data . i32 + chTags . count ,
depth Excl Tag) ! = ( chTags . data . i32 + chTags . count ) ;
depth Sizes Tag) ! = ( chTags . data . i32 + chTags . count ) ;
if ( ! ( isDepthExclusivePresent & & isDepthSizePresent ) ) {
if ( ! ( isDepthExclusivePresent & & isDepthSizePresent ) ) {
// No depth support, nothing more to do.
// No depth support, nothing more to do.
return OK ;
return OK ;
@ -676,7 +676,6 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::addDynamicDepthTags()
getSupportedDynamicDepthSizes ( supportedBlobSizes , supportedDepthSizes ,
getSupportedDynamicDepthSizes ( supportedBlobSizes , supportedDepthSizes ,
& supportedDynamicDepthSizes , & internalDepthSizes ) ;
& supportedDynamicDepthSizes , & internalDepthSizes ) ;
if ( supportedDynamicDepthSizes . empty ( ) ) {
if ( supportedDynamicDepthSizes . empty ( ) ) {
ALOGE ( " %s: No dynamic depth size matched! " , __func__ ) ;
// Nothing more to do.
// Nothing more to do.
return OK ;
return OK ;
}
}
@ -1715,11 +1714,10 @@ CameraProviderManager::ProviderInfo::DeviceInfo3::DeviceInfo3(const std::string&
__FUNCTION__ , strerror ( - res ) , res ) ;
__FUNCTION__ , strerror ( - res ) , res ) ;
return ;
return ;
}
}
res = addDynamicDepthTags ( ) ;
auto stat = addDynamicDepthTags ( ) ;
if ( OK ! = res ) {
if ( OK ! = stat ) {
ALOGE ( " %s: Failed appending dynamic depth tags: %s (%d) " , __FUNCTION__ , strerror ( - res ) ,
ALOGE ( " %s: Failed appending dynamic depth tags: %s (%d) " , __FUNCTION__ , strerror ( - stat ) ,
res ) ;
stat ) ;
return ;
}
}
camera_metadata_entry flashAvailable =
camera_metadata_entry flashAvailable =
mCameraCharacteristics . find ( ANDROID_FLASH_INFO_AVAILABLE ) ;
mCameraCharacteristics . find ( ANDROID_FLASH_INFO_AVAILABLE ) ;