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

Commit 8de01269 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Correct gainmap format check" into main

parents 10ff4239 e1b3903a

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,8 @@ status_t HeicCompositeStream::processInputFrame(int64_t frameNumber, 
    bool hasOutputBuffer = inputFrame.muxer != nullptr ||

            (mDequeuedOutputBufferCnt < kMaxOutputSurfaceProducerCount);

    bool hasGainmapMetadata = !inputFrame.isoGainmapMetadata.empty();

    bool hdrGainmapFormatReady = mHDRGainmapEnabled ? (mGainmapFormat != nullptr) : true;

    bool hdrGainmapFormatReady = mHDRGainmapEnabled ?

            (inputFrame.gainmapFormat.get() != nullptr) : true;



    ALOGV("%s: [%" PRId64 "]: appSegmentReady %d, codecOutputReady %d, codecInputReady %d,"

            " dequeuedOutputBuffer %d, timestamp %" PRId64, __FUNCTION__, frameNumber,