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

am ee38cd33: am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev

Browse Source 
* commit 'ee38cd33a91f9c153ef2b12d383766a314dfd95a':
  camera2: Avoid setting null metering regions in LEGACY.
  camera2: Fix JPEG orientation set by LEGACY request.
This commit is contained in:
Ruben Brunk
2014-09-22 19:19:39 +00:00
committed by Android Git Automerger
parent 453b35e2c4 8aa88195fe
commit 909cfbe062
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,8 +399,9 @@ public class LegacyRequestMapper {
// jpeg.orientation
{
int orientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION, orientation));
Integer orientation = request.get(CaptureRequest.JPEG_ORIENTATION);
params.setRotation(ParamsUtils.getOrDefault(request, JPEG_ORIENTATION,
(orientation == null) ? 0 : orientation));
}
// jpeg.quality
@@ -496,6 +497,11 @@ public class LegacyRequestMapper {
}
}
if (meteringRectangleList.size() == 0) {
Log.w(TAG, "Only received metering rectangles with weight 0.");
return Arrays.asList(ParameterUtils.CAMERA_AREA_DEFAULT);
}
// Ignore any regions beyond our maximum supported count
int countMeteringAreas =
Math.min(maxNumMeteringAreas, meteringRectangleList.size());