Merge "Camera: Lift the 32 pixel alignment Jpeg/R width limitation" into udc-dev
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index f7e02a8..2ebb98a 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -1172,10 +1172,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++;