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

Commit 5c103f29 authored by Michael Gonzalez's avatar Michael Gonzalez Committed by Shuzhen Wang
Browse files

Camera: Heic: Wait for output TS before dequeuing output buffers 

During testHeicExif, the codec output buffer timestamp may rarely arrive
after the first codec output tiles arrive.

Test: vendor testing
Bug: 141169323
Change-Id: Iba1c82b087533cb87a32d69f7d6908e2c925b807
parent b5986a36

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -597,7 +597,8 @@ void HeicCompositeStream::compilePendingInputLocked() { 
        // to look up timestamp.

        // to look up timestamp.

        int64_t bufferTime = -1;

        int64_t bufferTime = -1;

        if (mCodecOutputBufferTimestamps.empty()) {

        if (mCodecOutputBufferTimestamps.empty()) {

            ALOGE("%s: Failed to find buffer timestamp for codec output buffer!", __FUNCTION__);

            ALOGV("%s: Failed to find buffer timestamp for codec output buffer!", __FUNCTION__);

            break;

        } else {

        } else {

            // Direct mapping between camera timestamp (in ns) and codec timestamp (in us).

            // Direct mapping between camera timestamp (in ns) and codec timestamp (in us).

            bufferTime = mCodecOutputBufferTimestamps.front();

            bufferTime = mCodecOutputBufferTimestamps.front();