Merge "camera2: create session now checks surface size compatibility for shared surfaces" into main (0c493654) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -629,6 +629,9 @@ public class CameraDeviceImpl extends CameraDevice
		"any output streams");
		}

		if (!checkSurfaceSizesCompatible(outputs)) {
		return false;
		}
		checkInputConfiguration(inputConfig);

		boolean success = false;
		@@ -1870,6 +1873,22 @@ public class CameraDeviceImpl extends CameraDevice
		return false;
		}

		private boolean checkSurfaceSizesCompatible(List<OutputConfiguration> outputConfigs) {
		for (OutputConfiguration outputConfig : outputConfigs) {
		Size configuredSize = outputConfig.getConfiguredSize();
		for (Surface surface : outputConfig.getSurfaces()) {
		Size surfaceSize = SurfaceUtils.getSurfaceSize(surface);
		if (!surfaceSize.equals(configuredSize)) {
		Log.e(TAG, "Surface size not compatible with " +
		" outputConfiguration, configured size " + configuredSize +
		" surface size " + surfaceSize);
		return false;
		}
		}
		}
		return true;
		}

		private void checkInputConfiguration(InputConfiguration inputConfig) {
		if (inputConfig == null) {
		return;