Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 49f64f2e: am c2b40926: Merge "Fix intermediate preview size selection for legacy." into mnc-dev

Browse Source 
* commit '49f64f2e0a6fb3d0ab15dc04194a463412cfb1bc':
  Fix intermediate preview size selection for legacy.
This commit is contained in:
Ruben Brunk
2015-06-11 21:11:48 +00:00
committed by Android Git Automerger
parent 600bd60d7e 49f64f2e0a
commit 353d807fd9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/hardware/camera2/legacy/RequestThreadManager.java
View File

@@ -412,6 +412,9 @@ public class RequestThreadManager {
mParams.setPreviewFpsRange(bestRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX], mParams.setPreviewFpsRange(bestRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
bestRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]); bestRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
Size smallestSupportedJpegSize = calculatePictureSize(mCallbackOutputs,
callbackOutputSizes, mParams);
if (previewOutputSizes.size() > 0) { if (previewOutputSizes.size() > 0) {
Size largestOutput = SizeAreaComparator.findLargestByArea(previewOutputSizes); 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. // Find largest jpeg dimension - assume to have the same aspect ratio as sensor.
Size largestJpegDimen = ParameterUtils.getLargestSupportedJpegSizeByArea(mParams); Size largestJpegDimen = ParameterUtils.getLargestSupportedJpegSizeByArea(mParams);
Size chosenJpegDimen = (smallestSupportedJpegSize != null) ? smallestSupportedJpegSize
: largestJpegDimen;
List<Size> supportedPreviewSizes = ParameterUtils.convertSizeList( List<Size> supportedPreviewSizes = ParameterUtils.convertSizeList(
mParams.getSupportedPreviewSizes()); mParams.getSupportedPreviewSizes());
@@ -430,7 +436,7 @@ public class RequestThreadManager {
for (Size s : supportedPreviewSizes) { for (Size s : supportedPreviewSizes) {
long currArea = s.getWidth() * s.getHeight(); long currArea = s.getWidth() * s.getHeight();
long bestArea = bestPreviewDimen.getWidth() * bestPreviewDimen.getHeight(); long bestArea = bestPreviewDimen.getWidth() * bestPreviewDimen.getHeight();
if (checkAspectRatiosMatch(largestJpegDimen, s) && (currArea < bestArea && if (checkAspectRatiosMatch(chosenJpegDimen, s) && (currArea < bestArea &&
currArea >= largestOutputArea)) { currArea >= largestOutputArea)) {
bestPreviewDimen = s; bestPreviewDimen = s;
} }
@@ -451,8 +457,6 @@ public class RequestThreadManager {
} }
} }
Size smallestSupportedJpegSize = calculatePictureSize(mCallbackOutputs,
callbackOutputSizes, mParams);
if (smallestSupportedJpegSize != null) { if (smallestSupportedJpegSize != null) {
/* /*
* Set takePicture size to the smallest supported JPEG size large enough * Set takePicture size to the smallest supported JPEG size large enough