Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a50f9eef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Lift the 32 pixel alignment Jpeg/R width limitation" into udc-dev am: e8b62d43 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21616882



Change-Id: I2ac154729733a1180e8205652e908bedf719f6e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 355905a2 e8b62d43

services/camera/libcameraservice/common/CameraProviderManager.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -1172,10 +1172,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::deriveJpegRTags(bool 
            static_cast<android_pixel_format_t>(HAL_PIXEL_FORMAT_YCBCR_P010), &supportedP010Sizes);

            static_cast<android_pixel_format_t>(HAL_PIXEL_FORMAT_YCBCR_P010), &supportedP010Sizes);

    auto it = supportedP010Sizes.begin();

    auto it = supportedP010Sizes.begin();

    while (it != supportedP010Sizes.end()) {

    while (it != supportedP010Sizes.end()) {

        // Resolutions that don't align on 32 pixels are not supported by Jpeg/R.

        if (std::find(supportedBlobSizes.begin(), supportedBlobSizes.end(), *it) ==

        // This can be removed as soon as the encoder restriction is lifted.

                supportedBlobSizes.end()) {

        if ((std::find(supportedBlobSizes.begin(), supportedBlobSizes.end(), *it) ==

                supportedBlobSizes.end()) || ((std::get<0>(*it) % 32) != 0)) {

            it = supportedP010Sizes.erase(it);

            it = supportedP010Sizes.erase(it);

        } else {

        } else {

            it++;

            it++;