Camera: Lift the 32 pixel alignment Jpeg/R width limitation
32 pixel alignment for Jpeg/R outputs is no longer needed.
Remove the jpeg orientation capture result query. Exif orientation
is handled by the 'ExifUtils' output.
Bug: 262265296
Test: atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java#testJpegR
Change-Id: I709a23b5783def4554743d39eadea092cb9f6d90
diff --git a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
index 71f52db..bb7dd81 100644
--- a/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/JpegRCompositeStream.cpp
@@ -247,12 +247,6 @@
jpegQuality = entry.data.u8[0];
}
- uint8_t jpegOrientation = 0;
- entry = inputFrame.result.find(ANDROID_JPEG_ORIENTATION);
- if (entry.count > 0) {
- jpegOrientation = entry.data.i32[0];
- }
-
if ((res = native_window_set_buffers_dimensions(mOutputSurface.get(), maxJpegRBufferSize, 1))
!= OK) {
ALOGE("%s: Unable to configure stream buffer dimensions"
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 3b40da9..a1a3769 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1160,10 +1160,8 @@
static_cast<android_pixel_format_t>(HAL_PIXEL_FORMAT_YCBCR_P010), &supportedP010Sizes);
auto it = supportedP010Sizes.begin();
while (it != supportedP010Sizes.end()) {
- // Resolutions that don't align on 32 pixels are not supported by Jpeg/R.
- // This can be removed as soon as the encoder restriction is lifted.
- if ((std::find(supportedBlobSizes.begin(), supportedBlobSizes.end(), *it) ==
- supportedBlobSizes.end()) || ((std::get<0>(*it) % 32) != 0)) {
+ if (std::find(supportedBlobSizes.begin(), supportedBlobSizes.end(), *it) ==
+ supportedBlobSizes.end()) {
it = supportedP010Sizes.erase(it);
} else {
it++;