summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Cody <devincody@google.com>2023-04-12 19:50:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-12 19:50:11 +0000
commit2a70362064946009e9aef788ec8ebf3c20cac0bc (patch)
tree977e3d895a0bf52cdb077dcc006c495b13052394
parent8ce7ff94644f02cd9b6ab7eb6d2f8d53cc31e44e (diff)
parentb9985ee05fd589dab51d9b53e799df1165303661 (diff)
downloadcamera-2a70362064946009e9aef788ec8ebf3c20cac0bc.tar.gz
Merge "adding log_id to StreamConfiguration" into udc-dev am: b9985ee05f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/22435839 Change-Id: I1852cc1e213d3c140c21702cd2aba9aa36484cc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/hal/aidl_service/aidl_utils.cc1
-rw-r--r--common/hal/common/hal_types.h1
-rw-r--r--common/hal/google_camera_hal/basic_request_processor.cc1
-rw-r--r--common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc1
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;
}