diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-14 23:20:51 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-14 23:20:51 +0000 |
commit | 13fbc9ef28ef676b22f384ad787370a7426db881 (patch) | |
tree | 580d558d50500db40c78d522be22609fa03f47a9 | |
parent | 4ed1aecd361628fd7ab2bae090626c0b9726f226 (diff) | |
parent | 02c7c6903e8afe9cec01e935075795915cfb1dc1 (diff) | |
download | camera-android-cts-13.0_r4.tar.gz |
Snap for 8721292 from 02c7c6903e8afe9cec01e935075795915cfb1dc1 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release
Change-Id: I4c53312d7cc858e329d4578a71daa2c9da127678
-rw-r--r-- | common/hal/utils/result_dispatcher.cc | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/common/hal/utils/result_dispatcher.cc b/common/hal/utils/result_dispatcher.cc index 2d6d120..0a4832c 100644 --- a/common/hal/utils/result_dispatcher.cc +++ b/common/hal/utils/result_dispatcher.cc @@ -240,27 +240,29 @@ status_t ResultDispatcher::AddShutter(uint32_t frame_number, int64_t timestamp_ns, int64_t readout_timestamp_ns) { ATRACE_CALL(); - std::lock_guard<std::mutex> lock(result_lock_); + { + std::lock_guard<std::mutex> lock(result_lock_); - auto shutter_it = pending_shutters_.find(frame_number); - if (shutter_it == pending_shutters_.end()) { - ALOGE("%s: Cannot find the pending shutter for frame %u", __FUNCTION__, - frame_number); - return NAME_NOT_FOUND; - } + auto shutter_it = pending_shutters_.find(frame_number); + if (shutter_it == pending_shutters_.end()) { + ALOGE("%s: Cannot find the pending shutter for frame %u", __FUNCTION__, + frame_number); + return NAME_NOT_FOUND; + } - if (shutter_it->second.ready) { - ALOGE("%s: Already received shutter (%" PRId64 - ") for frame %u. New " - "timestamp %" PRId64, - __FUNCTION__, shutter_it->second.timestamp_ns, frame_number, - timestamp_ns); - return ALREADY_EXISTS; - } + if (shutter_it->second.ready) { + ALOGE("%s: Already received shutter (%" PRId64 + ") for frame %u. New " + "timestamp %" PRId64, + __FUNCTION__, shutter_it->second.timestamp_ns, frame_number, + timestamp_ns); + return ALREADY_EXISTS; + } - shutter_it->second.timestamp_ns = timestamp_ns; - shutter_it->second.readout_timestamp_ns = readout_timestamp_ns; - shutter_it->second.ready = true; + shutter_it->second.timestamp_ns = timestamp_ns; + shutter_it->second.readout_timestamp_ns = readout_timestamp_ns; + shutter_it->second.ready = true; + } { std::unique_lock<std::mutex> lock(notify_callback_lock_); is_result_shutter_updated_ = true; |