diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-06-08 15:59:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-06-08 15:59:33 +0000 |
| commit | d6f09a1d0458d04f873dddeab00a0afbef27f958 (patch) | |
| tree | fe86d78755af042aabd0d5d78ce402db0ea96bea | |
| parent | 41b3802130286448b82003e3118dae29815bafd8 (diff) | |
| parent | b1bcb49cff838a5ff1fe3558b83c600ddbf0f52f (diff) | |
| download | camera-d6f09a1d0458d04f873dddeab00a0afbef27f958.tar.gz | |
Merge "Add log_id to all other processors" into udc-d1-dev
6 files changed, 6 insertions, 0 deletions
diff --git a/common/hal/google_camera_hal/dual_ir_request_processor.cc b/common/hal/google_camera_hal/dual_ir_request_processor.cc index c4fca0b..b8aa769 100644 --- a/common/hal/google_camera_hal/dual_ir_request_processor.cc +++ b/common/hal/google_camera_hal/dual_ir_request_processor.cc @@ -73,6 +73,7 @@ status_t DualIrRequestProcessor::ConfigureStreams( HalCameraMetadata::Clone(stream_config.session_params.get()); process_block_stream_config->stream_config_counter = stream_config.stream_config_counter; + process_block_stream_config->log_id = stream_config.log_id; for (auto& stream : process_block_stream_config->streams) { // Assign all logical streams to the lead camera. diff --git a/common/hal/google_camera_hal/realtime_zsl_request_processor.cc b/common/hal/google_camera_hal/realtime_zsl_request_processor.cc index c5db47d..8232456 100644 --- a/common/hal/google_camera_hal/realtime_zsl_request_processor.cc +++ b/common/hal/google_camera_hal/realtime_zsl_request_processor.cc @@ -250,6 +250,7 @@ status_t RealtimeZslRequestProcessor::ConfigureStreams( HalCameraMetadata::Clone(stream_config.session_params.get()); process_block_stream_config->stream_config_counter = stream_config.stream_config_counter; + process_block_stream_config->log_id = stream_config.log_id; return OK; } diff --git a/common/hal/google_camera_hal/rgbird_result_request_processor.cc b/common/hal/google_camera_hal/rgbird_result_request_processor.cc index ee41697..e48e3d1 100644 --- a/common/hal/google_camera_hal/rgbird_result_request_processor.cc +++ b/common/hal/google_camera_hal/rgbird_result_request_processor.cc @@ -754,6 +754,7 @@ status_t RgbirdResultRequestProcessor::ConfigureStreams( process_block_stream_config->stream_config_counter = stream_config.stream_config_counter; } + process_block_stream_config->log_id = stream_config.log_id; return OK; } diff --git a/common/hal/google_camera_hal/rgbird_rt_request_processor.cc b/common/hal/google_camera_hal/rgbird_rt_request_processor.cc index cf2c6a3..1e752c4 100644 --- a/common/hal/google_camera_hal/rgbird_rt_request_processor.cc +++ b/common/hal/google_camera_hal/rgbird_rt_request_processor.cc @@ -447,6 +447,7 @@ status_t RgbirdRtRequestProcessor::ConfigureStreams( HalCameraMetadata::Clone(stream_config.session_params.get()); process_block_stream_config->stream_config_counter = stream_config.stream_config_counter; + process_block_stream_config->log_id = stream_config.log_id; bool has_depth_stream = false; for (auto& stream : stream_config.streams) { diff --git a/common/hal/google_camera_hal/snapshot_request_processor.cc b/common/hal/google_camera_hal/snapshot_request_processor.cc index bd07b55..3c66860 100644 --- a/common/hal/google_camera_hal/snapshot_request_processor.cc +++ b/common/hal/google_camera_hal/snapshot_request_processor.cc @@ -119,6 +119,7 @@ status_t SnapshotRequestProcessor::ConfigureStreams( HalCameraMetadata::Clone(stream_config.session_params.get()); process_block_stream_config->stream_config_counter = stream_config.stream_config_counter; + process_block_stream_config->log_id = stream_config.log_id; return OK; } diff --git a/common/hal/utils/hdrplus_request_processor.cc b/common/hal/utils/hdrplus_request_processor.cc index 36d2f83..9ca39fb 100644 --- a/common/hal/utils/hdrplus_request_processor.cc +++ b/common/hal/utils/hdrplus_request_processor.cc @@ -138,6 +138,7 @@ status_t HdrplusRequestProcessor::ConfigureStreams( HalCameraMetadata::Clone(stream_config.session_params.get()); process_block_stream_config->stream_config_counter = stream_config.stream_config_counter; + process_block_stream_config->log_id = stream_config.log_id; return OK; } |