commit d0f1ecb00cbc14ed9ddd8b74580e0b967b8ac497
author Shuzhen Wang <shuzhenwang@google.com> Thu Apr 21 17:24:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 21 17:24:52 2022 +0000
tree 5cdc2847a4111d9bffbef47d02a732a0afc39ad4
parent a1a4ad96a271564067ec777268f1101bb267ffee
parent 60fa4b987672408d6eef105e93184c5cdd4e8d91

Merge "Camera: Update crop info in onHeicFormatChanged"

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
index 6058429..5da77d6 100644
--- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -441,6 +441,10 @@
             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*/);