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

Commit 9ff692dc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7533212 from 86ec89e4 to sc-release

Change-Id: I087ba0f6a1bc697d094f6ac41330483968ee6bd1
parents 29130a71 86ec89e4
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1988,6 +1988,16 @@ typedef enum acamera_metadata_tag {
     * ACAMERA_CONTROL_ZOOM_RATIO is not 1.0, and ACAMERA_SCALER_CROP_REGION is set to be
     * windowboxing, the camera framework will override the ACAMERA_SCALER_CROP_REGION to be
     * the active array.</p>
     * <p>In the capture request, if the application sets ACAMERA_CONTROL_ZOOM_RATIO to a
     * value != 1.0, the ACAMERA_CONTROL_ZOOM_RATIO tag in the capture result reflects the
     * effective zoom ratio achieved by the camera device, and the ACAMERA_SCALER_CROP_REGION
     * adjusts for additional crops that are not zoom related. Otherwise, if the application
     * sets ACAMERA_CONTROL_ZOOM_RATIO to 1.0, or does not set it at all, the
     * ACAMERA_CONTROL_ZOOM_RATIO tag in the result metadata will also be 1.0.</p>
     * <p>When the application requests a physical stream for a logical multi-camera, the
     * ACAMERA_CONTROL_ZOOM_RATIO in the physical camera result metadata will be 1.0, and
     * the ACAMERA_SCALER_CROP_REGION tag reflects the amount of zoom and crop done by the
     * physical camera device.</p>
     *
     * @see ACAMERA_CONTROL_AE_REGIONS
     * @see ACAMERA_CONTROL_ZOOM_RATIO
+2 −1
Original line number Diff line number Diff line
@@ -654,7 +654,8 @@ status_t Camera3OutputStream::getBufferLockedCommon(ANativeWindowBuffer** anb, i
         * Then there is circular locking dependency.
         */
        sp<Surface> consumer = mConsumer;
        size_t remainingBuffers = camera_stream::max_buffers - mHandoutTotalBufferCount;
        size_t remainingBuffers = (mState == STATE_PREPARING ? mTotalBufferCount :
                                   camera_stream::max_buffers) - mHandoutTotalBufferCount;
        mLock.unlock();
        std::unique_lock<std::mutex> batchLock(mBatchLock);