commit fca6714fd6d72f6e9e47927d6ef246807cece7bf
author Susmitha Gummalla <vgummall@codeaurora.org> Thu Mar 05 14:58:30 2020 -0800
committer Shuzhen Wang <shuzhenwang@google.com> Fri Mar 06 09:01:49 2020 -0800
tree 1e562e8498795e7b900dd256096902f6c53a4f51
parent 796804387e39ddb35a63b747759dac955683809e

Camera: Intialize useGrid and chooseHeic variables

--Handle early return case in Heic Encoder Manager

Bug: 150894246
CRs-Fixed: 2636054
Change-Id: I7f437241a1f33cc4cb4384369828e12b331b09c9

services/camera/libcameraservice/api2/HeicEncoderInfoManager.cpp

diff --git a/services/camera/libcameraservice/api2/HeicEncoderInfoManager.cpp b/services/camera/libcameraservice/api2/HeicEncoderInfoManager.cpp
index d7cc2bf..d36ca3b 100644
--- a/services/camera/libcameraservice/api2/HeicEncoderInfoManager.cpp
+++ b/services/camera/libcameraservice/api2/HeicEncoderInfoManager.cpp
@@ -91,6 +91,8 @@
             // The "measured-frame-rate-WIDTHxHEIGHT-range" key is optional.
             // Hardcode to some default value (3.33ms * tile count) based on resolution.
             *stall = 3333333LL * width * height / (kGridWidth * kGridHeight);
+            *useHeic = chooseHeic;
+            *useGrid = enableGrid;
             return true;
         }
 
@@ -275,9 +277,13 @@
             ALOGE("%s: Failed to get codec info for %s", __FUNCTION__, mime);
             break;
         }
+        ALOGV("%s: [%s] codec found", __FUNCTION__,
+                info->getCodecName());
 
         // Filter out software ones as they may be too slow
         if (!(info->getAttributes() & MediaCodecInfo::kFlagIsHardwareAccelerated)) {
+            ALOGV("%s: [%s] Filter out software ones as they may be too slow", __FUNCTION__,
+                    info->getCodecName());
             continue;
         }