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

Commit cc27e117 authored by Zhijun He's avatar Zhijun He
Browse files

Camera: Save 1 frame time for takePicture call 

Move the latest request signal call right before submitting request to HAL,
which avoids unnecessary 1 frame time wait.

Also fix request status constructor issue, and the log tag for Camera2Client.

Bug: 10570497
Change-Id: I0b1818658bee9983b117e49a5a00f1aab515c567
parent b6028c42

services/camera/libcameraservice/api1/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "Camera2"

#define LOG_TAG "Camera2Client"

#define ATRACE_TAG ATRACE_TAG_CAMERA

//#define LOG_NDEBUG 0

services/camera/libcameraservice/device3/Camera3Device.cpp

+8 −9
Original line number Diff line number Diff line
@@ -1910,6 +1910,14 @@ bool Camera3Device::RequestThread::threadLoop() { 
        return false;

    }



    // Inform waitUntilRequestProcessed thread of a new request ID

    {

        Mutex::Autolock al(mLatestRequestMutex);



        mLatestRequestId = requestId;

        mLatestRequestSignal.signal();

    }



    // Submit request and block until ready for next one

    ATRACE_ASYNC_BEGIN("frame capture", request.frame_number);

    ATRACE_BEGIN("camera3->process_capture_request");
@@ -1945,15 +1953,6 @@ bool Camera3Device::RequestThread::threadLoop() { 
    }

    mPrevTriggers = triggerCount;



    // Read android.request.id from the request settings metadata

    // - inform waitUntilRequestProcessed thread of a new request ID

    {

        Mutex::Autolock al(mLatestRequestMutex);



        mLatestRequestId = requestId;

        mLatestRequestSignal.signal();

    }



    // Return input buffer back to framework

    if (request.input_buffer != NULL) {

        Camera3Stream *stream =

services/camera/libcameraservice/device3/Camera3Device.h

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ class Camera3Device : 
        InFlightRequest(int id, int numBuffers) :

                requestId(id),

                captureTimestamp(0),

                requestStatus(OK),

                haveResultMetadata(false),

                numBuffersLeft(numBuffers) {

        }