From 098720bc2cd9925d13a712d23ffcd747bf8cab52 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Tue, 23 Apr 2019 09:44:54 -0700 Subject: [PATCH] Camera: Allow out-of-order ZSL shutter notify - Allow shutter notifies of zero-shutter-lag requests with STILL_CAPTURE intent to be out of order compared to other kinds of requests. - Shutter notifies of same kind of requests must be in order. Test: BurstJpegCapture CTS test Bug: 120604717 Change-Id: Ia31f0d17322cb9b850614413feb1134e16d69552 --- camera/device/3.2/ICameraDeviceCallback.hal | 15 +++++++++++++++ current.txt | 1 + 2 files changed, 16 insertions(+) diff --git a/camera/device/3.2/ICameraDeviceCallback.hal b/camera/device/3.2/ICameraDeviceCallback.hal index 69715dec64..dec3bd88c6 100644 --- a/camera/device/3.2/ICameraDeviceCallback.hal +++ b/camera/device/3.2/ICameraDeviceCallback.hal @@ -125,6 +125,21 @@ interface ICameraDeviceCallback { * via a SHUTTER notify() call. It is highly recommended to dispatch this * call as early as possible. * + * The SHUTTER notify calls for requests with android.control.enableZsl + * set to TRUE and ANDROID_CONTROL_CAPTURE_INTENT == STILL_CAPTURE may be + * out-of-order compared to SHUTTER notify for other kinds of requests + * (including regular, reprocess, or zero-shutter-lag requests with + * different capture intents). + * + * As a result, the capture results of zero-shutter-lag requests with + * ANDROID_CONTROL_CAPTURE_INTENT == STILL_CAPTURE may be out-of-order + * compared to capture results for other kinds of requests. + * + * Different SHUTTER notify calls for zero-shutter-lag requests with + * ANDROID_CONTROL_CAPTURE_INTENT == STILL_CAPTURE must be in order between + * them, as is for other kinds of requests. SHUTTER notify calls for + * zero-shutter-lag requests with non STILL_CAPTURE intent must be in order + * with SHUTTER notify calls for regular requests. * ------------------------------------------------------------------------ * Performance requirements: * diff --git a/current.txt b/current.txt index 3a6241c285..cd51ff50ff 100644 --- a/current.txt +++ b/current.txt @@ -386,6 +386,7 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar # ABI preserving changes to HALs during Android Q 2a55e224aa9bc62c0387cd85ad3c97e33f0c33a4e1489cbae86b2523e6f9df35 android.hardware.camera.device@3.2::ICameraDevice +17e878cb11ea602c08af04a09182e6265498be16edf26605058383b9a7628261 android.hardware.camera.device@3.2::ICameraDeviceCallback 8caf9104dc6885852c0b117d853dd93f6d4b61a0a365138295eb8bcd41b36423 android.hardware.camera.device@3.2::ICameraDeviceSession 684702a60deef03a1e8093961dc0a18c555c857ad5a77ba7340b0635ae01eb70 android.hardware.camera.device@3.4::ICameraDeviceSession f8a19622cb0cc890913b1ef3e32b675ffb26089a09e02fef4056ebad324d2b5d android.hardware.camera.device@3.4::types