From 17a371de6e2e77b761a7b2da2393e5f85d4e910f 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 --- 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 c063f3e73d..beafcf066b 100644 --- a/current.txt +++ b/current.txt @@ -388,6 +388,7 @@ cd4330c3196bda1d642a32abfe23a7d64ebfbda721940643af6867af3b3f0aa9 android.hardwar 2a55e224aa9bc62c0387cd85ad3c97e33f0c33a4e1489cbae86b2523e6f9df35 android.hardware.camera.device@3.2::ICameraDevice 8caf9104dc6885852c0b117d853dd93f6d4b61a0a365138295eb8bcd41b36423 android.hardware.camera.device@3.2::ICameraDeviceSession 684702a60deef03a1e8093961dc0a18c555c857ad5a77ba7340b0635ae01eb70 android.hardware.camera.device@3.4::ICameraDeviceSession +e96190f635b8458b92525bd6e040fec4ccbac22fdd4bc7274a9794ab976362f7 android.hardware.camera.device@3.4::types 291638a1b6d4e63283e9e722ab5049d9351717ffa2b66162124f84d1aa7c2835 android.hardware.camera.metadata@3.2::types 8a075cf3a17fe99c6d23415a3e9a65612f1fee73ee052a3a8a0ca5b8877395a4 android.hardware.camera.metadata@3.3::types da33234403ff5d60f3473711917b9948e6484a4260b5247acdafb111193a9de2 android.hardware.configstore@1.0::ISurfaceFlingerConfigs