Merge "Camera2: Heic: Reduce FRAME_RATE in case no grid is used"

5 years ago · 03915e1f5a
parent 0e1c20080a 0ca8152738
commit 03915e1f5a
1 changed files with 1 additions and 1 deletions
--- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@ -1210,7 +1210,7 @@ status_t HeicCompositeStream::initializeCodec(uint32_t width, uint32_t height,
    outputFormat->setInt32(KEY_I_FRAME_INTERVAL, 0);
    outputFormat->setInt32(KEY_COLOR_FORMAT,
            useGrid ? COLOR_FormatYUV420Flexible : COLOR_FormatSurface);
-    outputFormat->setInt32(KEY_FRAME_RATE, gridRows * gridCols);
+    outputFormat->setInt32(KEY_FRAME_RATE, useGrid ? gridRows * gridCols : kNoGridOpRate);
    // This only serves as a hint to encoder when encoding is not real-time.
    outputFormat->setInt32(KEY_OPERATING_RATE, useGrid ? kGridOpRate : kNoGridOpRate);