diff options
| author | Devin Cody <devincody@google.com> | 2023-03-15 00:05:50 +0000 |
|---|---|---|
| committer | Devin Cody <devincody@google.com> | 2023-04-03 23:02:41 +0000 |
| commit | 923e5366fea531767531227fe5e3db05fe6070c8 (patch) | |
| tree | 976ed7273194068deeec3b6eadf02e2e82bc68cb | |
| parent | 21a4402fbf743e10916ed584dc4e83823b020c21 (diff) | |
| download | camera-923e5366fea531767531227fe5e3db05fe6070c8.tar.gz | |
adding log_id to StreamConfiguration
log_id lets us join CameraFramework metrics to Lyric metrics.
BUG: 267668584
Test: Unit
Change-Id: Ifb1e171dce74ab6f69d41f176a00a9bc8fa38a1a
Merged-In: Ifb1e171dce74ab6f69d41f176a00a9bc8fa38a1a
4 files changed, 4 insertions, 0 deletions
diff --git a/common/hal/aidl_service/aidl_utils.cc b/common/hal/aidl_service/aidl_utils.cc index 4a673b6..6d5f201 100644 --- a/common/hal/aidl_service/aidl_utils.cc +++ b/common/hal/aidl_service/aidl_utils.cc @@ -963,6 +963,7 @@ status_t ConvertToHalStreamConfig( aidl_stream_config.streamConfigCounter; hal_stream_config->multi_resolution_input_image = aidl_stream_config.multiResolutionInputImage; + hal_stream_config->log_id = aidl_stream_config.logId; return OK; } diff --git a/common/hal/common/hal_types.h b/common/hal/common/hal_types.h index e27f78e..0f7f9da 100644 --- a/common/hal/common/hal_types.h +++ b/common/hal/common/hal_types.h @@ -151,6 +151,7 @@ struct StreamConfiguration { std::unique_ptr<HalCameraMetadata> session_params; uint32_t stream_config_counter = 0; bool multi_resolution_input_image = false; + long log_id = 0; }; struct CameraIdAndStreamConfiguration { diff --git a/common/hal/google_camera_hal/basic_request_processor.cc b/common/hal/google_camera_hal/basic_request_processor.cc index c38d9e0..06beb5d 100644 --- a/common/hal/google_camera_hal/basic_request_processor.cc +++ b/common/hal/google_camera_hal/basic_request_processor.cc @@ -61,6 +61,7 @@ status_t BasicRequestProcessor::ConfigureStreams( stream_config.stream_config_counter; process_block_stream_config->multi_resolution_input_image = stream_config.multi_resolution_input_image; + process_block_stream_config->log_id = stream_config.log_id; return OK; } diff --git a/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc b/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc index be455eb..472b5bc 100644 --- a/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc +++ b/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc @@ -233,6 +233,7 @@ status_t RealtimeZslResultRequestProcessor::ConfigureStreams( stream_config.stream_config_counter; process_block_stream_config->multi_resolution_input_image = stream_config.multi_resolution_input_image; + process_block_stream_config->log_id = stream_config.log_id; return OK; } |