From eaab6169b1d33c0873ba070fdf9c08ea8162483b Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Mon, 14 Jan 2019 10:09:52 -0800 Subject: [PATCH] Camera: Clarify the FMQ read order for request/result If there are more than one metadata entities being passed via FMQ, specify the framework read order. Test: Build Bug: 119575429 Change-Id: Ia34ac69ce670b1ebeda12d92af490c347f33c15b Merged-In: Ia34ac69ce670b1ebeda12d92af490c347f33c15b --- camera/device/3.4/types.hal | 9 ++++++--- current.txt | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/camera/device/3.4/types.hal b/camera/device/3.4/types.hal index bf2b3fcedc..8ee826bb90 100644 --- a/camera/device/3.4/types.hal +++ b/camera/device/3.4/types.hal @@ -164,6 +164,9 @@ struct PhysicalCameraSetting { * If non-zero, read settings from request queue instead * (see ICameraDeviceSession.getCaptureRequestMetadataQueue). * If zero, read settings from .settings field. + * + * The v3_2 settings metadata is read first from the FMQ, followed by + * the physical cameras' settings metadata starting from index 0. */ uint64_t fmqSettingsSize; @@ -238,6 +241,9 @@ struct PhysicalCameraMetadata { * If non-zero, read metadata from result metadata queue instead * (see ICameraDeviceSession.getCaptureResultMetadataQueue). * If zero, read metadata from .metadata field. + * + * The v3_2 CaptureResult metadata is read first from the FMQ, followed by + * the physical cameras' metadata starting from index 0. */ uint64_t fmqMetadataSize; @@ -251,9 +257,6 @@ struct PhysicalCameraMetadata { /** * If fmqMetadataSize is zero, the metadata buffer contains the metadata * for the physical device with physicalCameraId. - * - * The v3_2 CaptureResult metadata is read first from the FMQ, followed by - * the physical cameras' metadata starting from index 0. */ CameraMetadata metadata; }; diff --git a/current.txt b/current.txt index 2e57febf17..61dae6dec4 100644 --- a/current.txt +++ b/current.txt @@ -386,6 +386,7 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar # ABI preserving changes to HALs during Android Q f72d23278af99a2f6a9c1d40352b67dbf1f582282f799f88f7235dc7c13892b5 android.hardware.camera.device@3.2::ICameraDeviceSession +e96190f635b8458b92525bd6e040fec4ccbac22fdd4bc7274a9794ab976362f7 android.hardware.camera.device@3.4::types da33234403ff5d60f3473711917b9948e6484a4260b5247acdafb111193a9de2 android.hardware.configstore@1.0::ISurfaceFlingerConfigs 21165b8e30c4b2d52980e4728f661420adc16e38bbe73476c06b2085be908f4c android.hardware.gnss@1.0::IGnssCallback d702fb01dc2a0733aa820b7eb65435ee3334f75632ef880bafd2fb8803a20a58 android.hardware.gnss@1.0::IGnssMeasurementCallback