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

Commit f0c4a6b5 authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Camera: Treat decreasing timestamp as BUFFER_ERROR 

Decreasing timestamp shouldn't happen in non ZSL or reprocessing case.
When that happens, treat the buffer as error and return to buffer queue
directly.

Test: Camera CTS
Bug: 113670946
Change-Id: I39d3417dd9307d6cc7c90ff357a82604566a9081
parent 89e319f7

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+4 −6
Original line number Diff line number Diff line
@@ -237,12 +237,14 @@ status_t Camera3OutputStream::returnBufferCheckedLocked( 
    /**

     * Return buffer back to ANativeWindow

     */

    if (buffer.status == CAMERA3_BUFFER_STATUS_ERROR || mDropBuffers) {

    if (buffer.status == CAMERA3_BUFFER_STATUS_ERROR || mDropBuffers || timestamp == 0) {

        // Cancel buffer

        if (mDropBuffers) {

            ALOGV("%s: Dropping a frame for stream %d.", __FUNCTION__, mId);

        } else {

        } else if (buffer.status == CAMERA3_BUFFER_STATUS_ERROR) {

            ALOGW("%s: A frame is dropped for stream %d due to buffer error.", __FUNCTION__, mId);

        } else {

            ALOGE("%s: Stream %d: timestamp shouldn't be 0", __FUNCTION__, mId);

        }



        res = currentConsumer->cancelBuffer(currentConsumer.get(),
@@ -268,10 +270,6 @@ status_t Camera3OutputStream::returnBufferCheckedLocked( 
            mTraceFirstBuffer = false;

        }



        if (timestamp == 0) {

            ALOGW("%s: Stream %d: timestamp shouldn't be 0", __FUNCTION__, mId);

        }



        /* Certain consumers (such as AudioSource or HardwareComposer) use

         * MONOTONIC time, causing time misalignment if camera timestamp is

         * in BOOTTIME. Do the conversion if necessary. */

services/camera/libcameraservice/device3/Camera3Stream.cpp

+6 −3
Original line number Diff line number Diff line
@@ -662,9 +662,12 @@ status_t Camera3Stream::returnBuffer(const camera3_stream_buffer &buffer, 


    removeOutstandingBuffer(buffer);



    // Buffer status may be changed, so make a copy of the stream_buffer struct.

    camera3_stream_buffer b = buffer;

    if (timestampIncreasing && timestamp != 0 && timestamp <= mLastTimestamp) {

        ALOGW("%s: Stream %d: timestamp %" PRId64 " is not increasing. Prev timestamp %" PRId64,

        ALOGE("%s: Stream %d: timestamp %" PRId64 " is not increasing. Prev timestamp %" PRId64,

                __FUNCTION__, mId, timestamp, mLastTimestamp);

        b.status = CAMERA3_BUFFER_STATUS_ERROR;

    }

    mLastTimestamp = timestamp;
@@ -676,9 +679,9 @@ status_t Camera3Stream::returnBuffer(const camera3_stream_buffer &buffer, 
     *

     * Do this for getBuffer as well.

     */

    status_t res = returnBufferLocked(buffer, timestamp);

    status_t res = returnBufferLocked(b, timestamp);

    if (res == OK) {

        fireBufferListenersLocked(buffer, /*acquired*/false, /*output*/true);

        fireBufferListenersLocked(b, /*acquired*/false, /*output*/true);

    }



    // Even if returning the buffer failed, we still want to signal whoever is waiting for the