Merge "Camera: Enable surface sharing for all formats" (bdca1706) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+0 −16

Original line number	Diff line number	Diff line
		@@ -654,14 +654,6 @@ binder::Status CameraDeviceClient::createStream(
		return res;

		if (!isStreamInfoValid) {
		// Streaming sharing is only supported for IMPLEMENTATION_DEFINED
		// formats.
		if (isShared && streamInfo.format != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) {
		String8 msg = String8::format("Camera %s: Stream sharing is only supported for "
		"IMPLEMENTATION_DEFINED format", mCameraIdStr.string());
		ALOGW("%s: %s", __FUNCTION__, msg.string());
		return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());
		}
		isStreamInfoValid = true;
		}

		@@ -941,14 +933,6 @@ binder::Status CameraDeviceClient::updateOutputConfiguration(int streamId,
		if (!res.isOk())
		return res;

		// Stream sharing is only supported for IMPLEMENTATION_DEFINED
		// formats.
		if (outInfo.format != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED) {
		String8 msg = String8::format("Camera %s: Stream sharing is only supported for "
		"IMPLEMENTATION_DEFINED format", mCameraIdStr.string());
		ALOGW("%s: %s", __FUNCTION__, msg.string());
		return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());
		}
		streamInfos.push_back(outInfo);
		newOutputs.push_back(surface);
		}