Merge "Camera: Fix potentail race condition" into rvc-dev (17f95108) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -259,14 +259,16 @@ void sendCaptureResult(
	}		}

	// Fix up some result metadata to account for HAL-level distortion correction		// Fix up some result metadata to account for HAL-level distortion correction
	status_t res =		status_t res = OK;
	states.distortionMappers[states.cameraId.c_str()].correctCaptureResult(		auto iter = states.distortionMappers.find(states.cameraId.c_str());
	&captureResult.mMetadata);		if (iter != states.distortionMappers.end()) {
			res = iter->second.correctCaptureResult(&captureResult.mMetadata);
	if (res != OK) {		if (res != OK) {
	SET_ERR("Unable to correct capture result metadata for frame %d: %s (%d)",		SET_ERR("Unable to correct capture result metadata for frame %d: %s (%d)",
	frameNumber, strerror(-res), res);		frameNumber, strerror(-res), res);
	return;		return;
	}		}
			}

	// Fix up result metadata to account for zoom ratio availabilities between		// Fix up result metadata to account for zoom ratio availabilities between
	// HAL and app.		// HAL and app.