diff options
| author | Mao Lee <chengmaolee@google.com> | 2023-03-17 12:12:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-17 12:12:12 +0000 |
| commit | 3733295dcdf84d211d726e14d3caa9732ce15922 (patch) | |
| tree | 892172612fee085ebcede89f4b79d8c9ab306776 | |
| parent | 529f74eeccfd3c01e05962e770cf62801d34db6f (diff) | |
| parent | 33e50da46cb9a3d33c61c805a3468a5629dc59de (diff) | |
| download | camera-3733295dcdf84d211d726e14d3caa9732ce15922.tar.gz | |
Allowing for [30, 30] to [60, 60] transition happen without session reconfiguration am: 051167f0b5 am: 33e50da46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/22107276
Change-Id: Iac828bc921f27820b74dac64c0e918f3e344bdeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/hal/utils/utils.cc | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/common/hal/utils/utils.cc b/common/hal/utils/utils.cc index 93a3e13..6bc5867 100644 --- a/common/hal/utils/utils.cc +++ b/common/hal/utils/utils.cc @@ -376,21 +376,33 @@ bool IsSessionParameterCompatible(const HalCameraMetadata* old_session, int32_t new_min_fps = new_entry.data.i32[0]; int32_t new_max_fps = new_entry.data.i32[1]; // Do not reconfigure session if max FPS hasn't changed or in - // the special case that AE FPS is throttling [60, 60] to [30, 30] - // from GCA side, provided the setprop is enabled - uint8_t video_60_to_30fps_thermal_throtlle = 0; + // the special case that AE FPS is throttling [60, 60] to [30, 30] or + // restored from [30, 30] to [60, 60] from GCA side when session parameter + // kVideo60to30FPSThermalThrottle is enabled. + uint8_t video_60_to_30fps_thermal_throttle = 0; camera_metadata_ro_entry_t video_60_to_30fps_throttle_entry; if (new_session->Get(kVideo60to30FPSThermalThrottle, &video_60_to_30fps_throttle_entry) == OK) { - video_60_to_30fps_thermal_throtlle = + video_60_to_30fps_thermal_throttle = video_60_to_30fps_throttle_entry.data.u8[0]; } - if (old_max_fps == new_max_fps || - (video_60_to_30fps_thermal_throtlle && (old_min_fps == 60) && - (old_max_fps == 60) && (new_min_fps == 30) && (new_max_fps == 30))) { - ALOGI("%s: Ignore fps (%d, %d) to (%d, %d)", __FUNCTION__, old_min_fps, - old_max_fps, new_min_fps, new_max_fps); + bool ignore_fps_range_diff = false; + if (video_60_to_30fps_thermal_throttle) { + if (((old_min_fps == 60) && (old_max_fps == 60) && + (new_min_fps == 30) && (new_max_fps == 30)) || + ((old_min_fps == 30) && (old_max_fps == 30) && + (new_min_fps == 60) && (new_max_fps == 60))) { + ignore_fps_range_diff = true; + } + } + + if (old_max_fps == new_max_fps || ignore_fps_range_diff) { + ALOGI( + "%s: Ignore fps (%d, %d) to (%d, %d). " + "video_60_to_30fps_thermal_throttle: %u", + __FUNCTION__, old_min_fps, old_max_fps, new_min_fps, new_max_fps, + video_60_to_30fps_thermal_throttle); continue; } |