diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-11-04 04:08:00 +0000 |
|---|---|---|
| committer | Alfred Piccioni <alpic@google.com> | 2023-11-06 13:22:02 +0000 |
| commit | f8f6473c97f4d0acdd1932c0de1d4f6917e4537b (patch) | |
| tree | 6ae9b3f7aca6328670ab5d35de21a7ce28c12b78 | |
| parent | f17f12dd164700957c0a0828e03a9b58935b8d0f (diff) | |
| download | camera-f8f6473c97f4d0acdd1932c0de1d4f6917e4537b.tar.gz | |
EmulatedCamera: Fix up camera result metadata
If certain capture result keys are not availble, do not keep them
in CaptureResult metadata.
Test: atest CtsCameraTestCases
Fixes: 308907960
Change-Id: I0816e949821ba95ecf44d162b13f7b70500acdff
| -rw-r--r-- | devices/EmulatedCamera/hwl/EmulatedRequestState.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/devices/EmulatedCamera/hwl/EmulatedRequestState.cpp b/devices/EmulatedCamera/hwl/EmulatedRequestState.cpp index 22c63ab..4e4fba6 100644 --- a/devices/EmulatedCamera/hwl/EmulatedRequestState.cpp +++ b/devices/EmulatedCamera/hwl/EmulatedRequestState.cpp @@ -995,14 +995,20 @@ std::unique_ptr<HwlPipelineResult> EmulatedRequestState::InitializeResult( if (report_exposure_time_) { result->result_metadata->Set(ANDROID_SENSOR_EXPOSURE_TIME, &sensor_exposure_time_, 1); + } else { + result->result_metadata->Erase(ANDROID_SENSOR_EXPOSURE_TIME); } if (report_frame_duration_) { result->result_metadata->Set(ANDROID_SENSOR_FRAME_DURATION, &sensor_frame_duration_, 1); + } else { + result->result_metadata->Erase(ANDROID_SENSOR_FRAME_DURATION); } if (report_sensitivity_) { result->result_metadata->Set(ANDROID_SENSOR_SENSITIVITY, &sensor_sensitivity_, 1); + } else { + result->result_metadata->Erase(ANDROID_SENSOR_SENSITIVITY); } if (report_rolling_shutter_skew_) { result->result_metadata->Set( |