diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-08-13 00:55:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 00:55:24 +0000 |
| commit | 5732386666aa2265d658e9fc861a1dfe22033861 (patch) | |
| tree | 1ba35271c05fcf3790f7216ff625c1e00df81c12 /services/camera/libcameraservice/device3/Camera3Device.cpp | |
| parent | 4327df2af078894c38a8eb69f4873bef92cc0f83 (diff) | |
| parent | c96ac8dfcae66a45b7ae67b82dabdf19f60f859d (diff) | |
| download | frameworks_av-5732386666aa2265d658e9fc861a1dfe22033861.zip frameworks_av-5732386666aa2265d658e9fc861a1dfe22033861.tar.gz frameworks_av-5732386666aa2265d658e9fc861a1dfe22033861.tar.bz2 | |
Merge "Camera3Device: Relax InFlightMap size check" into mnc-dev
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Device.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index c91517c..0a4440f 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -2090,8 +2090,12 @@ void Camera3Device::removeInFlightRequestIfReadyLocked(int idx) { // Sanity check - if we have too many in-flight frames, something has // likely gone wrong - if (mInFlightMap.size() > kInFlightWarnLimit) { + if (!mIsConstrainedHighSpeedConfiguration && mInFlightMap.size() > kInFlightWarnLimit) { CLOGE("In-flight list too large: %zu", mInFlightMap.size()); + } else if (mIsConstrainedHighSpeedConfiguration && mInFlightMap.size() > + kInFlightWarnLimitHighSpeed) { + CLOGE("In-flight list too large for high speed configuration: %zu", + mInFlightMap.size()); } } |