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

Merge "Camera: Switch the jpeg orientation when using the native encoder" into sc-qpr1-dev am: 6e60223a63

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15899922

Change-Id: I9cca2c93a9e128d065d9d1412df7df04fea1b3c0
This commit is contained in:
TreeHugger Robot
2021-09-23 22:04:52 +00:00
committed by Automerger Merge Worker
parent b428e51f30 6e60223a63
commit 92105a485a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/camera2/impl/CameraExtensionJpegProcessor.java
View File

@@ -58,7 +58,7 @@ public class CameraExtensionJpegProcessor implements ICaptureProcessorImpl {
private static final class JpegParameters { private static final class JpegParameters {
public HashSet<Long> mTimeStamps = new HashSet<>(); public HashSet<Long> mTimeStamps = new HashSet<>();
public int mRotation = JPEG_DEFAULT_ROTATION; // CCW multiple of 90 degrees public int mRotation = JPEG_DEFAULT_ROTATION; // CW multiple of 90 degrees
public int mQuality = JPEG_DEFAULT_QUALITY; // [0..100] public int mQuality = JPEG_DEFAULT_QUALITY; // [0..100]
} }
@@ -100,7 +100,8 @@ public class CameraExtensionJpegProcessor implements ICaptureProcessorImpl {
Integer orientation = captureBundles.get(0).captureResult.get( Integer orientation = captureBundles.get(0).captureResult.get(
CaptureResult.JPEG_ORIENTATION); CaptureResult.JPEG_ORIENTATION);
if (orientation != null) { if (orientation != null) {
ret.mRotation = orientation / 90; // The jpeg encoder expects CCW rotation, convert from CW
ret.mRotation = (360 - (orientation % 360)) / 90;
} else { } else {
Log.w(TAG, "No jpeg rotation set, using default: " + JPEG_DEFAULT_ROTATION); Log.w(TAG, "No jpeg rotation set, using default: " + JPEG_DEFAULT_ROTATION);
} }