Merge "Fix intermediate preview size selection for legacy." into mnc-dev (c2b40926) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/legacy/RequestThreadManager.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -412,6 +412,9 @@ public class RequestThreadManager {
		mParams.setPreviewFpsRange(bestRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
		bestRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);

		Size smallestSupportedJpegSize = calculatePictureSize(mCallbackOutputs,
		callbackOutputSizes, mParams);

		if (previewOutputSizes.size() > 0) {

		Size largestOutput = SizeAreaComparator.findLargestByArea(previewOutputSizes);
		@@ -419,6 +422,9 @@ public class RequestThreadManager {
		// Find largest jpeg dimension - assume to have the same aspect ratio as sensor.
		Size largestJpegDimen = ParameterUtils.getLargestSupportedJpegSizeByArea(mParams);

		Size chosenJpegDimen = (smallestSupportedJpegSize != null) ? smallestSupportedJpegSize
		: largestJpegDimen;

		List<Size> supportedPreviewSizes = ParameterUtils.convertSizeList(
		mParams.getSupportedPreviewSizes());

		@@ -430,7 +436,7 @@ public class RequestThreadManager {
		for (Size s : supportedPreviewSizes) {
		long currArea = s.getWidth() * s.getHeight();
		long bestArea = bestPreviewDimen.getWidth() * bestPreviewDimen.getHeight();
		if (checkAspectRatiosMatch(largestJpegDimen, s) && (currArea < bestArea &&
		if (checkAspectRatiosMatch(chosenJpegDimen, s) && (currArea < bestArea &&
		currArea >= largestOutputArea)) {
		bestPreviewDimen = s;
		}
		@@ -451,8 +457,6 @@ public class RequestThreadManager {
		}
		}

		Size smallestSupportedJpegSize = calculatePictureSize(mCallbackOutputs,
		callbackOutputSizes, mParams);
		if (smallestSupportedJpegSize != null) {
		/*
		* Set takePicture size to the smallest supported JPEG size large enough