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

Commit 7e25e5e2 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Remove AE pre-capture trigger cancel override 

Bug: 34392075
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
-m testAePrecaptureTriggerCancelJpegCapture
Change-Id: I0e632c83fb3ae0e4df26fe35bf1ef8441c1f20fa
parent 08dd245c

services/camera/libcameraservice/device3/Camera3Device.cpp

+15 −101
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ status_t Camera3Device::initialize(CameraModule *module) 


    /** Everything is good to go */



    mDeviceVersion = device->common.version;

    mDeviceInfo = info.static_camera_characteristics;

    mInterface = std::make_unique<HalInterface>(device);
@@ -231,9 +230,6 @@ status_t Camera3Device::initialize(sp<CameraProviderManager> manager) { 
        // Don't use the queue onwards.

    }



    // TODO: camera service will absorb 3_2/3_3/3_4 differences in the future

    //       for now use 3_4 to keep legacy devices working

    mDeviceVersion = CAMERA_DEVICE_API_VERSION_3_4;

    mInterface = std::make_unique<HalInterface>(session, queue);

    std::string providerType;

    mVendorTagId = manager->getProviderTagIdLocked(mId.string());
@@ -262,17 +258,8 @@ status_t Camera3Device::initializeCommonLocked() { 


    mTagMonitor.initialize(mVendorTagId);



    bool aeLockAvailable = false;

    camera_metadata_entry aeLockAvailableEntry = mDeviceInfo.find(

            ANDROID_CONTROL_AE_LOCK_AVAILABLE);

    if (aeLockAvailableEntry.count > 0) {

        aeLockAvailable = (aeLockAvailableEntry.data.u8[0] ==

                ANDROID_CONTROL_AE_LOCK_AVAILABLE_TRUE);

    }



    /** Start up request queue thread */

    mRequestThread = new RequestThread(this, mStatusTracker, mInterface.get(), mDeviceVersion,

            aeLockAvailable);

    mRequestThread = new RequestThread(this, mStatusTracker, mInterface.get());

    res = mRequestThread->run(String8::format("C3Dev-%s-ReqQueue", mId.string()).string());

    if (res != OK) {

        SET_ERR_L("Unable to start request queue thread: %s (%d)",
@@ -2417,14 +2404,13 @@ void Camera3Device::setErrorStateLockedV(const char *fmt, va_list args) { 


status_t Camera3Device::registerInFlight(uint32_t frameNumber,

        int32_t numBuffers, CaptureResultExtras resultExtras, bool hasInput,

        const AeTriggerCancelOverride_t &aeTriggerCancelOverride,

        bool hasAppCallback) {

    ATRACE_CALL();

    Mutex::Autolock l(mInFlightLock);



    ssize_t res;

    res = mInFlightMap.add(frameNumber, InFlightRequest(numBuffers, resultExtras, hasInput,

            aeTriggerCancelOverride, hasAppCallback));

            hasAppCallback));

    if (res < 0) return res;



    if (mInFlightMap.size() == 1) {
@@ -2509,8 +2495,8 @@ void Camera3Device::removeInFlightRequestIfReadyLocked(int idx) { 
    }

}



void Camera3Device::insertResultLocked(CaptureResult *result, uint32_t frameNumber,

            const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {

void Camera3Device::insertResultLocked(CaptureResult *result,

        uint32_t frameNumber) {

    if (result == nullptr) return;



    camera_metadata_t *meta = const_cast<camera_metadata_t *>(
@@ -2529,8 +2515,6 @@ void Camera3Device::insertResultLocked(CaptureResult *result, uint32_t frameNumb 
        return;

    }



    overrideResultForPrecaptureCancel(&result->mMetadata, aeTriggerCancelOverride);



    // Valid result, insert into queue

    List<CaptureResult>::iterator queuedResult =

            mResultQueue.insert(mResultQueue.end(), CaptureResult(*result));
@@ -2545,15 +2529,14 @@ void Camera3Device::insertResultLocked(CaptureResult *result, uint32_t frameNumb 




void Camera3Device::sendPartialCaptureResult(const camera_metadata_t * partialResult,

        const CaptureResultExtras &resultExtras, uint32_t frameNumber,

        const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {

        const CaptureResultExtras &resultExtras, uint32_t frameNumber) {

    Mutex::Autolock l(mOutputLock);



    CaptureResult captureResult;

    captureResult.mResultExtras = resultExtras;

    captureResult.mMetadata = partialResult;



    insertResultLocked(&captureResult, frameNumber, aeTriggerCancelOverride);

    insertResultLocked(&captureResult, frameNumber);

}
@@ -2561,8 +2544,7 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata, 
        CaptureResultExtras &resultExtras,

        CameraMetadata &collectedPartialResult,

        uint32_t frameNumber,

        bool reprocess,

        const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {

        bool reprocess) {

    if (pendingMetadata.isEmpty())

        return;
@@ -2618,7 +2600,7 @@ void Camera3Device::sendCaptureResult(CameraMetadata &pendingMetadata, 
    mTagMonitor.monitorMetadata(TagMonitor::RESULT,

            frameNumber, timestamp.data.i64[0], captureResult.mMetadata);



    insertResultLocked(&captureResult, frameNumber, aeTriggerCancelOverride);

    insertResultLocked(&captureResult, frameNumber);

}



/**
@@ -2696,8 +2678,8 @@ void Camera3Device::processCaptureResult(const camera3_capture_result *result) { 


            if (isPartialResult && request.hasCallback) {

                // Send partial capture result

                sendPartialCaptureResult(result->result, request.resultExtras, frameNumber,

                        request.aeTriggerCancelOverride);

                sendPartialCaptureResult(result->result, request.resultExtras,

                        frameNumber);

            }

        }
@@ -2762,8 +2744,8 @@ void Camera3Device::processCaptureResult(const camera3_capture_result *result) { 
                CameraMetadata metadata;

                metadata = result->result;

                sendCaptureResult(metadata, request.resultExtras,

                    collectedPartialResult, frameNumber, hasInputBufferInRequest,

                    request.aeTriggerCancelOverride);

                    collectedPartialResult, frameNumber,

                    hasInputBufferInRequest);

            }

        }
@@ -2943,7 +2925,7 @@ void Camera3Device::notifyShutter(const camera3_shutter_msg_t &msg, 
                // send pending result and buffers

                sendCaptureResult(r.pendingMetadata, r.resultExtras,

                    r.collectedPartialResult, msg.frame_number,

                    r.hasInputBuffer, r.aeTriggerCancelOverride);

                    r.hasInputBuffer);

            }

            returnOutputBuffers(r.pendingOutputBuffers.array(),

                r.pendingOutputBuffers.size(), r.shutterTimestamp);
@@ -3491,14 +3473,11 @@ void Camera3Device::HalInterface::onBufferFreed( 


Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent,

        sp<StatusTracker> statusTracker,

        HalInterface* interface,

        uint32_t deviceVersion,

        bool aeLockAvailable) :

        HalInterface* interface) :

        Thread(/*canCallJava*/false),

        mParent(parent),

        mStatusTracker(statusTracker),

        mInterface(interface),

        mDeviceVersion(deviceVersion),

        mListener(nullptr),

        mId(getId(parent)),

        mReconfigured(false),
@@ -3510,7 +3489,6 @@ Camera3Device::RequestThread::RequestThread(wp<Camera3Device> parent, 
        mCurrentPreCaptureTriggerId(0),

        mRepeatingLastFrameNumber(

            hardware::camera2::ICameraDeviceUser::NO_IN_FLIGHT_REPEATING_FRAMES),

        mAeLockAvailable(aeLockAvailable),

        mPrepareVideoStream(false) {

    mStatusId = statusTracker->addComponent();

}
@@ -3738,65 +3716,6 @@ void Camera3Device::RequestThread::requestExit() { 
    mRequestSignal.signal();

}





/**

 * For devices <= CAMERA_DEVICE_API_VERSION_3_2, AE_PRECAPTURE_TRIGGER_CANCEL is not supported so

 * we need to override AE_PRECAPTURE_TRIGGER_CANCEL to AE_PRECAPTURE_TRIGGER_IDLE and AE_LOCK_OFF

 * to AE_LOCK_ON to start cancelling AE precapture. If AE lock is not available, it still overrides

 * AE_PRECAPTURE_TRIGGER_CANCEL to AE_PRECAPTURE_TRIGGER_IDLE but doesn't add AE_LOCK_ON to the

 * request.

 */

void Camera3Device::RequestThread::handleAePrecaptureCancelRequest(const sp<CaptureRequest>& request) {

    request->mAeTriggerCancelOverride.applyAeLock = false;

    request->mAeTriggerCancelOverride.applyAePrecaptureTrigger = false;



    if (mDeviceVersion > CAMERA_DEVICE_API_VERSION_3_2) {

        return;

    }



    camera_metadata_entry_t aePrecaptureTrigger =

            request->mSettings.find(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER);

    if (aePrecaptureTrigger.count > 0 &&

            aePrecaptureTrigger.data.u8[0] == ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL) {

        // Always override CANCEL to IDLE

        uint8_t aePrecaptureTrigger = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;

        request->mSettings.update(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &aePrecaptureTrigger, 1);

        request->mAeTriggerCancelOverride.applyAePrecaptureTrigger = true;

        request->mAeTriggerCancelOverride.aePrecaptureTrigger =

                ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL;



        if (mAeLockAvailable == true) {

            camera_metadata_entry_t aeLock = request->mSettings.find(ANDROID_CONTROL_AE_LOCK);

            if (aeLock.count == 0 ||  aeLock.data.u8[0] == ANDROID_CONTROL_AE_LOCK_OFF) {

                uint8_t aeLock = ANDROID_CONTROL_AE_LOCK_ON;

                request->mSettings.update(ANDROID_CONTROL_AE_LOCK, &aeLock, 1);

                request->mAeTriggerCancelOverride.applyAeLock = true;

                request->mAeTriggerCancelOverride.aeLock = ANDROID_CONTROL_AE_LOCK_OFF;

            }

        }

    }

}



/**

 * Override result metadata for cancelling AE precapture trigger applied in

 * handleAePrecaptureCancelRequest().

 */

void Camera3Device::overrideResultForPrecaptureCancel(

        CameraMetadata *result, const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {

    if (aeTriggerCancelOverride.applyAeLock) {

        // Only devices <= v3.2 should have this override

        assert(mDeviceVersion <= CAMERA_DEVICE_API_VERSION_3_2);

        result->update(ANDROID_CONTROL_AE_LOCK, &aeTriggerCancelOverride.aeLock, 1);

    }



    if (aeTriggerCancelOverride.applyAePrecaptureTrigger) {

        // Only devices <= v3.2 should have this override

        assert(mDeviceVersion <= CAMERA_DEVICE_API_VERSION_3_2);

        result->update(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,

                &aeTriggerCancelOverride.aePrecaptureTrigger, 1);

    }

}



void Camera3Device::RequestThread::checkAndStopRepeatingRequest() {

    bool surfaceAbandoned = false;

    int64_t lastFrameNumber = 0;
@@ -4164,7 +4083,6 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 
        res = parent->registerInFlight(halRequest->frame_number,

                totalNumBuffers, captureRequest->mResultExtras,

                /*hasInput*/halRequest->input_buffer != NULL,

                captureRequest->mAeTriggerCancelOverride,

                hasCallback);

        ALOGVV("%s: registered in flight requestId = %" PRId32 ", frameNumber = %" PRId64

               ", burstId = %" PRId32 ".",
@@ -4423,8 +4341,6 @@ sp<Camera3Device::CaptureRequest> 
        }

    }



    handleAePrecaptureCancelRequest(nextRequest);



    return nextRequest;

}
@@ -4510,9 +4426,7 @@ status_t Camera3Device::RequestThread::insertTriggers( 
                request->mResultExtras.afTriggerId = triggerId;

                mCurrentAfTriggerId = triggerId;

            }

            if (parent->mDeviceVersion >= CAMERA_DEVICE_API_VERSION_3_2) {

                continue; // Trigger ID tag is deprecated since device HAL 3.2

            }

            continue;

        }



        camera_metadata_entry entry = metadata.find(tag);

services/camera/libcameraservice/device3/Camera3Device.h

+6 −42
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ class Camera3Device : 


    CameraMetadata             mRequestTemplateCache[CAMERA3_TEMPLATE_COUNT];



    uint32_t                   mDeviceVersion;



    // whether Camera3Device should derive ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST for

    // backward compatibility. Should not be changed after initialization.

    bool                       mDerivePostRawSensKey = false;
@@ -403,13 +401,6 @@ class Camera3Device : 
    // words, camera device shouldn't be open during CPU suspend.

    nsecs_t                    mTimestampOffset;



    typedef struct AeTriggerCancelOverride {

        bool applyAeLock;

        uint8_t aeLock;

        bool applyAePrecaptureTrigger;

        uint8_t aePrecaptureTrigger;

    } AeTriggerCancelOverride_t;



    class CaptureRequest : public LightRefBase<CaptureRequest> {

      public:

        CameraMetadata                      mSettings;
@@ -419,9 +410,6 @@ class Camera3Device : 
                                            mOutputStreams;

        SurfaceMap                          mOutputSurfaces;

        CaptureResultExtras                 mResultExtras;

        // Used to cancel AE precapture trigger for devices doesn't support

        // CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL

        AeTriggerCancelOverride_t           mAeTriggerCancelOverride;

        // The number of requests that should be submitted to HAL at a time.

        // For example, if batch size is 8, this request and the following 7

        // requests will be submitted to HAL at a time. The batch size for
@@ -641,9 +629,7 @@ class Camera3Device : 


        RequestThread(wp<Camera3Device> parent,

                sp<camera3::StatusTracker> statusTracker,

                HalInterface* interface,

                uint32_t deviceVersion,

                bool aeLockAvailable);

                HalInterface* interface);

        ~RequestThread();



        void     setNotificationListener(wp<NotificationListener> listener);
@@ -777,9 +763,6 @@ class Camera3Device : 
        // If the input request is in mRepeatingRequests. Must be called with mRequestLock hold

        bool isRepeatingRequestLocked(const sp<CaptureRequest>&);



        // Handle AE precapture trigger cancel for devices <= CAMERA_DEVICE_API_VERSION_3_2.

        void handleAePrecaptureCancelRequest(const sp<CaptureRequest>& request);



        // Clear repeating requests. Must be called with mRequestLock held.

        status_t clearRepeatingRequestsLocked(/*out*/ int64_t *lastFrameNumber = NULL);
@@ -792,7 +775,6 @@ class Camera3Device : 
        wp<Camera3Device>  mParent;

        wp<camera3::StatusTracker>  mStatusTracker;

        HalInterface*      mInterface;

        uint32_t           mDeviceVersion;



        wp<NotificationListener> mListener;
@@ -842,9 +824,6 @@ class Camera3Device : 


        int64_t            mRepeatingLastFrameNumber;



        // Whether the device supports AE lock

        bool               mAeLockAvailable;



        // Flag indicating if we should prepare video stream for video requests.

        bool               mPrepareVideoStream;

    };
@@ -885,10 +864,6 @@ class Camera3Device : 
        // the shutter event.

        Vector<camera3_stream_buffer_t> pendingOutputBuffers;



        // Used to cancel AE precapture trigger for devices doesn't support

        // CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL

        AeTriggerCancelOverride_t aeTriggerCancelOverride;



        // Whether this inflight request's shutter and result callback are to be

        // called. The policy is that if the request is the last one in the constrained

        // high speed recording request list, this flag will be true. If the request list
@@ -903,12 +878,11 @@ class Camera3Device : 
                haveResultMetadata(false),

                numBuffersLeft(0),

                hasInputBuffer(false),

                aeTriggerCancelOverride({false, 0, false, 0}),

                hasCallback(true) {

        }



        InFlightRequest(int numBuffers, CaptureResultExtras extras, bool hasInput,

                AeTriggerCancelOverride aeTriggerCancelOverride, bool hasAppCallback) :

                bool hasAppCallback) :

                shutterTimestamp(0),

                sensorTimestamp(0),

                requestStatus(OK),
@@ -916,7 +890,6 @@ class Camera3Device : 
                numBuffersLeft(numBuffers),

                resultExtras(extras),

                hasInputBuffer(hasInput),

                aeTriggerCancelOverride(aeTriggerCancelOverride),

                hasCallback(hasAppCallback) {

        }

    };
@@ -930,14 +903,7 @@ class Camera3Device : 


    status_t registerInFlight(uint32_t frameNumber,

            int32_t numBuffers, CaptureResultExtras resultExtras, bool hasInput,

            const AeTriggerCancelOverride_t &aeTriggerCancelOverride, bool callback);



    /**

     * Override result metadata for cancelling AE precapture trigger applied in

     * handleAePrecaptureCancelRequest().

     */

    void overrideResultForPrecaptureCancel(CameraMetadata* result,

            const AeTriggerCancelOverride_t &aeTriggerCancelOverride);

            bool callback);



    /**

     * Tracking for idle detection
@@ -1032,21 +998,19 @@ class Camera3Device : 


    // Send a partial capture result.

    void sendPartialCaptureResult(const camera_metadata_t * partialResult,

            const CaptureResultExtras &resultExtras, uint32_t frameNumber,

            const AeTriggerCancelOverride_t &aeTriggerCancelOverride);

            const CaptureResultExtras &resultExtras, uint32_t frameNumber);



    // Send a total capture result given the pending metadata and result extras,

    // partial results, and the frame number to the result queue.

    void sendCaptureResult(CameraMetadata &pendingMetadata,

            CaptureResultExtras &resultExtras,

            CameraMetadata &collectedPartialResult, uint32_t frameNumber,

            bool reprocess, const AeTriggerCancelOverride_t &aeTriggerCancelOverride);

            bool reprocess);



    // Insert the result to the result queue after updating frame number and overriding AE

    // trigger cancel.

    // mOutputLock must be held when calling this function.

    void insertResultLocked(CaptureResult *result, uint32_t frameNumber,

            const AeTriggerCancelOverride_t &aeTriggerCancelOverride);

    void insertResultLocked(CaptureResult *result, uint32_t frameNumber);



    /**** Scope for mInFlightLock ****/