commit 6a6d3a881a42927abd176c40a03b7abd5173d4a1
author Jayant Chowdhary <jchowdhary@google.com> Wed Nov 17 16:54:34 2021 -0800
committer Jayant Chowdhary <jchowdhary@google.com> Thu Dec 09 23:43:46 2021 +0000
tree 9952aa648aa86fb80216ac7254d73b41e4948656
parent 3837cf62e4aac6405f6b0d083bebe2bfb5b81930

Use physical camera characteristics for various buffer size calculations for physical streams.

Bug: 205907791

Test: Camera CTS

Change-Id: I964dc3d998fa38ce57222b77646a840ed419d00b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/common/CameraDeviceBase.h

diff --git a/services/camera/libcameraservice/common/CameraDeviceBase.h b/services/camera/libcameraservice/common/CameraDeviceBase.h
index 07b5f16..b42f3f6 100644
--- a/services/camera/libcameraservice/common/CameraDeviceBase.h
+++ b/services/camera/libcameraservice/common/CameraDeviceBase.h
@@ -99,7 +99,8 @@
     virtual status_t dump(int fd, const Vector<String16> &args) = 0;
 
     /**
-     * The physical camera device's static characteristics metadata buffer
+     * The physical camera device's static characteristics metadata buffer, or
+     * the logical camera's static characteristics if physical id is empty.
      */
     virtual const CameraMetadata& infoPhysical(const String8& physicalId) const = 0;
 
@@ -304,7 +305,8 @@
      * Get Jpeg buffer size for a given jpeg resolution.
      * Negative values are error codes.
      */
-    virtual ssize_t getJpegBufferSize(uint32_t width, uint32_t height) const = 0;
+    virtual ssize_t getJpegBufferSize(const CameraMetadata &info, uint32_t width,
+            uint32_t height) const = 0;
 
     /**
      * Connect HAL notifications to a listener. Overwrites previous