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

Commit 1d156233 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Add support test pattern session parameter" into main am: c1319769 am: 590ade12 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2752186



Change-Id: I1b5524cd3b9df22111e728ef0e4039bda873d9c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfe79116 590ade12

services/camera/libcameraservice/device3/Camera3Device.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3586,6 +3586,7 @@ bool Camera3Device::RequestThread::threadLoop() { 
        captureRequest->mRotateAndCropChanged = (mComposerOutput && !mOverrideToPortrait) ? false :

            overrideAutoRotateAndCrop(captureRequest);

        captureRequest->mAutoframingChanged = overrideAutoframing(captureRequest);

        captureRequest->mTestPatternChanged = overrideTestPattern(captureRequest);

    }



    // 'mNextRequests' will at this point contain either a set of HFR batched requests
@@ -3732,7 +3733,6 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
        bool triggersMixedIn = (triggerCount > 0 || mPrevTriggers > 0);

        mPrevTriggers = triggerCount;



        bool testPatternChanged = overrideTestPattern(captureRequest);

        bool settingsOverrideChanged = overrideSettingsOverride(captureRequest);



        // If the request is the same as last, or we had triggers now or last time or
@@ -3741,7 +3741,7 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
                (mPrevRequest != captureRequest || triggersMixedIn ||

                         captureRequest->mRotateAndCropChanged ||

                         captureRequest->mAutoframingChanged ||

                         testPatternChanged || settingsOverrideChanged) &&

                         captureRequest->mTestPatternChanged || settingsOverrideChanged) &&

                // Request settings are all the same within one batch, so only treat the first

                // request in a batch as new

                !(batchedRequest && i > 0);

services/camera/libcameraservice/device3/Camera3Device.h

+2 −0
Original line number Diff line number Diff line
@@ -651,6 +651,8 @@ class Camera3Device : 
        bool                                mAutoframingAuto;

        // Indicates that the auto framing value within 'mSettingsList' was modified

        bool                                mAutoframingChanged = false;

        // Indicates that the camera test pattern setting is modified

        bool                                mTestPatternChanged = false;



        // Whether this capture request has its zoom ratio set to 1.0x before

        // the framework overrides it for camera HAL consumption.