From d25dc976bd8bb77228ff686a5944042ef061d8b7 Mon Sep 17 00:00:00 2001
From: Shuzhen Wang <shuzhenwang@google.com>
Date: Tue, 24 Mar 2020 17:11:43 -0700
Subject: [PATCH] Camera: Make sure JPEG_QUALITY has reasonable default values
 in default templates

Test: CameraDeviceTest on Pixel 4
Bug: 149337877
Change-Id: I77b8302ba9011db80acb931b3849087d18b7153e
---
 services/camera/libcameraservice/device3/Camera3Device.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 87bdef6fd4..2d46122626 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1722,6 +1722,13 @@ status_t Camera3Device::createDefaultRequest(int templateId,
             return res;
         }
 
+        // Fill in JPEG_QUALITY if not available
+        if (!mRequestTemplateCache[templateId].exists(ANDROID_JPEG_QUALITY)) {
+            static const uint8_t kDefaultJpegQuality = 95;
+            mRequestTemplateCache[templateId].update(ANDROID_JPEG_QUALITY,
+                    &kDefaultJpegQuality, 1);
+        }
+
         *request = mRequestTemplateCache[templateId];
         mLastTemplateId = templateId;
     }