Merge "Camera: Remove fwk only keys after they are used" into main (d67963d8) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Device.cpp

+7 −13

Original line number	Diff line number	Diff line
		@@ -3882,12 +3882,6 @@ status_t Camera3Device::RequestThread::prepareHalRequests() {
		it != captureRequest->mSettingsList.end(); it++) {
		if (parent->mUHRCropAndMeteringRegionMappers.find(it->cameraId) ==
		parent->mUHRCropAndMeteringRegionMappers.end()) {
		if (removeFwkOnlyKeys(&(it->metadata)) != OK) {
		SET_ERR("RequestThread: Unable to remove fwk-only keys from request"
		"%d: %s (%d)", halRequest->frame_number, strerror(-res),
		res);
		return INVALID_OPERATION;
		}
		continue;
		}

		@@ -3902,12 +3896,6 @@ status_t Camera3Device::RequestThread::prepareHalRequests() {
		return INVALID_OPERATION;
		}
		captureRequest->mUHRCropAndMeteringRegionsUpdated = true;
		if (removeFwkOnlyKeys(&(it->metadata)) != OK) {
		SET_ERR("RequestThread: Unable to remove fwk-only keys from request"
		"%d: %s (%d)", halRequest->frame_number, strerror(-res),
		res);
		return INVALID_OPERATION;
		}
		}
		}

		@@ -3981,7 +3969,13 @@ status_t Camera3Device::RequestThread::prepareHalRequests() {
		"%d: %s (%d)", halRequest->frame_number, strerror(-res), res);
		return INVALID_OPERATION;
		}

		res = removeFwkOnlyKeys(&(it->metadata));
		if (res != OK) {
		SET_ERR("RequestThread: Unable to remove fwk-only keys from request"
		"%d: %s (%d)", halRequest->frame_number, strerror(-res),
		res);
		return INVALID_OPERATION;
		}
		if (!parent->mSupportsExtensionKeys) {
		res = filterExtensionKeys(&it->metadata);
		if (res != OK) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -458,11 +458,11 @@ void sendCaptureResult(
		}

		// Note: Physical camera continues to use SCALER_CROP_REGION to reflect
		// zoom levels.
		// zoom levels. Model this by treating app-set ZOOM_RATIO as 1x.
		res = states.zoomRatioMappers[cameraId].updateCaptureResult(
		&physicalMetadata.mCameraMetadataInfo.get<CameraMetadataInfo::metadata>(),
		/zoomMethodIsRatio/false,
		/zoomRatioIs1/false);
		/zoomRatioIs1/true);
		if (res != OK) {
		SET_ERR("Failed to update camera %s's physical zoom ratio metadata for "
		"frame %d: %s(%d)", cameraId.c_str(), frameNumber, strerror(-res), res);