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

Commit 99da7fc6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Remove app segment stream's locked buffer tracking" into rvc-qpr-dev am: aab6038b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13084269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4bcb14e999d9f6f1614d48e3b613e6c3e5ca3bc
parents 666f0b36 aab6038b

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+0 −7
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ HeicCompositeStream::HeicCompositeStream(sp<CameraDeviceBase> device, 
        mYuvBufferAcquired(false),

        mProducerListener(new ProducerListener()),

        mDequeuedOutputBufferCnt(0),

        mLockedAppSegmentBufferCnt(0),

        mCodecOutputCounter(0),

        mQuality(-1),

        mGridTimestampUs(0),
@@ -634,7 +633,6 @@ void HeicCompositeStream::compilePendingInputLocked() { 
            mAppSegmentConsumer->unlockBuffer(imgBuffer);

        } else {

            mPendingInputFrames[frameNumber].appSegmentBuffer = imgBuffer;

            mLockedAppSegmentBufferCnt++;

        }

        mInputAppSegmentBuffers.erase(it);

        mAppSegmentFrameNumbers.pop();
@@ -897,10 +895,6 @@ status_t HeicCompositeStream::processInputFrame(int64_t frameNumber, 
                        strerror(-res), res);

                return res;

            }

        } else if (mLockedAppSegmentBufferCnt == kMaxAcquiredAppSegment) {

            ALOGE("%s: Out-of-order app segment buffers reaches limit %u", __FUNCTION__,

                    kMaxAcquiredAppSegment);

            return INVALID_OPERATION;

        }

    }
@@ -1038,7 +1032,6 @@ status_t HeicCompositeStream::processAppSegment(int64_t frameNumber, InputFrame 
    mAppSegmentConsumer->unlockBuffer(inputFrame.appSegmentBuffer);

    inputFrame.appSegmentBuffer.data = nullptr;

    inputFrame.exifError = false;

    mLockedAppSegmentBufferCnt--;



    return OK;

}

services/camera/libcameraservice/api2/HeicCompositeStream.h

+0 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ private: 


    // Keep all incoming APP segment Blob buffer pending further processing.

    std::vector<int64_t> mInputAppSegmentBuffers;

    int32_t           mLockedAppSegmentBufferCnt;



    // Keep all incoming HEIC blob buffer pending further processing.

    std::vector<CodecOutputBufferInfo> mCodecOutputBuffers;