Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 832f2438 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android Git Automerger
Browse files

am 0459a574: am 57323866: Merge "Camera3Device: Relax InFlightMap size check" into mnc-dev 

* commit '0459a574':
  Camera3Device: Relax InFlightMap size check
parents 3c23af85 0459a574

services/camera/libcameraservice/device3/Camera3Device.cpp

+5 −1
Original line number Diff line number Diff line
@@ -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());

    }

}

services/camera/libcameraservice/device3/Camera3Device.h

+3 −1
Original line number Diff line number Diff line
@@ -154,9 +154,11 @@ class Camera3Device : 
  private:

    static const size_t        kDumpLockAttempts  = 10;

    static const size_t        kDumpSleepDuration = 100000; // 0.10 sec

    static const size_t        kInFlightWarnLimit = 20;

    static const nsecs_t       kShutdownTimeout   = 5000000000; // 5 sec

    static const nsecs_t       kActiveTimeout     = 500000000;  // 500 ms

    static const size_t        kInFlightWarnLimit = 20;

    static const size_t        kInFlightWarnLimitHighSpeed = 256; // batch size 32 * pipe depth 8



    struct                     RequestTrigger;

    // minimal jpeg buffer size: 256KB + blob header

    static const ssize_t       kMinJpegBufferSize = 256 * 1024 + sizeof(camera3_jpeg_blob);