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

Commit 32009fed authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Update crop info in onHeicFormatChanged" am: d0f1ecb0 am:... 

Merge "Camera: Update crop info in onHeicFormatChanged" am: d0f1ecb0 am: e6637aeb am: 96c23cda

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



Change-Id: I8a2d944f6da9d0b9afba8ebfca4805f7afec3ee3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f61b8abe 96c23cda

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+4 −0
Original line number Diff line number Diff line
@@ -441,6 +441,10 @@ void HeicCompositeStream::onHeicFormatChanged(sp<AMessage>& newFormat) { 
            newFormat->setInt32(KEY_TILE_HEIGHT, mGridHeight);

            newFormat->setInt32(KEY_GRID_ROWS, mGridRows);

            newFormat->setInt32(KEY_GRID_COLUMNS, mGridCols);

            int32_t left, top, right, bottom;

            if (newFormat->findRect("crop", &left, &top, &right, &bottom)) {

                newFormat->setRect("crop", 0, 0, mOutputWidth - 1, mOutputHeight - 1);

            }

        }

    }

    newFormat->setInt32(KEY_IS_DEFAULT, 1 /*isPrimary*/);