am 4541531a: am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally."...

* commit '4541531a6e64329764ad7359775689a8f5aca165':
  Camera2/3: Create JPEG stream unconditionally.

diff --cc services/camera/libcameraservice/Camera2Client.cpp
index 5b8f25a,a1971e3..d1ab7eb
--- 1/services/camera/libcameraservice/Camera2Client.cpp
--- 2/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@@ -749,11 -682,25 +749,27 @@@ status_t Camera2Client::startPreviewL(P
          return res;
      }
  
+     // We could wait to create the JPEG output stream until first actual use
+     // (first takePicture call). However, this would substantially increase the
+     // first capture latency on HAL3 devices, and potentially on some HAL2
+     // devices. So create it unconditionally at preview start. As a drawback,
+     // this increases gralloc memory consumption for applications that don't
+     // ever take a picture.
+     // TODO: Find a better compromise, though this likely would involve HAL
+     // changes.
+     res = updateProcessorStream(mJpegProcessor, params);
+     if (res != OK) {
+         ALOGE("%s: Camera %d: Can't pre-configure still image "
+                 "stream: %s (%d)",
+                 __FUNCTION__, mCameraId, strerror(-res), res);
+         return res;
+     }
+ 
      Vector<uint8_t> outputStreams;
 -    bool callbacksEnabled = params.previewCallbackFlags &
 -        CAMERA_FRAME_CALLBACK_FLAG_ENABLE_MASK;
 +    bool callbacksEnabled = (params.previewCallbackFlags &
 +            CAMERA_FRAME_CALLBACK_FLAG_ENABLE_MASK) ||
 +            params.previewCallbackSurface;
 +
      if (callbacksEnabled) {
          res = mCallbackProcessor->updateStream(params);
          if (res != OK) {