Merge "Camera: Allow finalizeOutputConfiguration not adding new surface" (760d007b) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1217,6 +1217,13 @@ binder::Status CameraDeviceClient::finalizeOutputConfigurations(int32_t streamId
	return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());		return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());
	}		}

			if (mStreamInfoMap[streamId].finalized) {
			String8 msg = String8::format("Camera %s: finalizeOutputConfigurations has been called"
			" on stream ID %d", mCameraIdStr.string(), streamId);
			ALOGW("%s: %s", __FUNCTION__, msg.string());
			return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());
			}

	if (!mDevice.get()) {		if (!mDevice.get()) {
	return STATUS_ERROR(CameraService::ERROR_DISCONNECTED, "Camera device no longer alive");		return STATUS_ERROR(CameraService::ERROR_DISCONNECTED, "Camera device no longer alive");
	}		}
	@@ -1246,13 +1253,6 @@ binder::Status CameraDeviceClient::finalizeOutputConfigurations(int32_t streamId
	surfaceId++;		surfaceId++;
	}		}

	if (consumerSurfaces.size() == 0) {
	String8 msg = String8::format("Camera %s: New OutputConfiguration has the same surfaces"
	" for stream (ID %d)", mCameraIdStr.string(), streamId);
	ALOGW("%s: %s", __FUNCTION__, msg.string());
	return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());
	}

	// Finish the deferred stream configuration with the surface.		// Finish the deferred stream configuration with the surface.
	status_t err;		status_t err;
	err = mDevice->setConsumerSurfaces(streamId, consumerSurfaces);		err = mDevice->setConsumerSurfaces(streamId, consumerSurfaces);
	@@ -1267,6 +1267,7 @@ binder::Status CameraDeviceClient::finalizeOutputConfigurations(int32_t streamId
	if (deferredStreamIndex != NAME_NOT_FOUND) {		if (deferredStreamIndex != NAME_NOT_FOUND) {
	mDeferredStreams.removeItemsAt(deferredStreamIndex);		mDeferredStreams.removeItemsAt(deferredStreamIndex);
	}		}
			mStreamInfoMap[streamId].finalized = true;
	} else if (err == NO_INIT) {		} else if (err == NO_INIT) {
	res = STATUS_ERROR_FMT(CameraService::ERROR_ILLEGAL_ARGUMENT,		res = STATUS_ERROR_FMT(CameraService::ERROR_ILLEGAL_ARGUMENT,
	"Camera %s: Deferred surface is invalid: %s (%d)",		"Camera %s: Deferred surface is invalid: %s (%d)",

services/camera/libcameraservice/api2/CameraDeviceClient.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -215,6 +215,7 @@ private:
	int format;		int format;
	android_dataspace dataSpace;		android_dataspace dataSpace;
	int32_t consumerUsage;		int32_t consumerUsage;
			bool finalized = false;
	OutputStreamInfo() :		OutputStreamInfo() :
	width(-1), height(-1), format(-1), dataSpace(HAL_DATASPACE_UNKNOWN),		width(-1), height(-1), format(-1), dataSpace(HAL_DATASPACE_UNKNOWN),
	consumerUsage(0) {}		consumerUsage(0) {}