Merge "Revert "Camera2: create new streams if surface size has changed"" (79ac3edc) · Commits · e / os / android_frameworks_base

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

+1 −13

Original line number	Diff line number	Diff line
		@@ -95,8 +95,6 @@ public class CameraDeviceImpl extends CameraDevice {
		new SimpleEntry<>(REQUEST_ID_NONE, null);
		private final SparseArray<OutputConfiguration> mConfiguredOutputs =
		new SparseArray<>();
		private final SparseArray<Size> mConfiguredOutputSizes =
		new SparseArray<>();

		private final String mCameraId;
		private final CameraCharacteristics mCharacteristics;
		@@ -389,17 +387,10 @@ public class CameraDeviceImpl extends CameraDevice {

		if (!outputs.contains(outConfig)) {
		deleteList.add(streamId);
		} else {
		// Even if same surface and rotation, the surface can have re-sized.
		// If so, we must create a new stream to ensure HAL is configured correctly.
		Size outSize = SurfaceUtils.getSurfaceSize(outConfig.getSurface());
		if (!outSize.equals(mConfiguredOutputSizes.valueAt(i))) {
		deleteList.add(streamId);
		} else {
		addSet.remove(outConfig); // Don't create a stream previously created
		}
		}
		}

		mDeviceHandler.post(mCallOnBusy);
		stopRepeating();
		@@ -430,16 +421,13 @@ public class CameraDeviceImpl extends CameraDevice {
		for (Integer streamId : deleteList) {
		mRemoteDevice.deleteStream(streamId);
		mConfiguredOutputs.delete(streamId);
		mConfiguredOutputSizes.delete(streamId);
		}

		// Add all new streams
		for (OutputConfiguration outConfig : outputs) {
		if (addSet.contains(outConfig)) {
		int streamId = mRemoteDevice.createStream(outConfig);
		Size outSize = SurfaceUtils.getSurfaceSize(outConfig.getSurface());
		mConfiguredOutputs.put(streamId, outConfig);
		mConfiguredOutputSizes.put(streamId, outSize);
		}
		}