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

Commit 9654e310 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "cameraserver: Remove extranous operation in insertGbpLocked."

parents 17cc6371 293c58c3

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ binder::Status CameraDeviceClient::insertGbpLocked(const sp<IGraphicBufferProduc 


    const StreamSurfaceId& streamSurfaceId = mStreamMap.valueAt(idx);

    if (outSurfaceMap->find(streamSurfaceId.streamId()) == outSurfaceMap->end()) {

        (*outSurfaceMap)[streamSurfaceId.streamId()] = std::vector<size_t>();

        outputStreamIds->push_back(streamSurfaceId.streamId());

    }

    (*outSurfaceMap)[streamSurfaceId.streamId()].push_back(streamSurfaceId.surfaceId());

services/camera/libcameraservice/api2/DepthCompositeStream.cpp

+0 −2
Original line number Diff line number Diff line
@@ -666,13 +666,11 @@ void DepthCompositeStream::onFrameAvailable(const BufferItem& item) { 
status_t DepthCompositeStream::insertGbp(SurfaceMap* /*out*/outSurfaceMap,

        Vector<int32_t> * /*out*/outputStreamIds, int32_t* /*out*/currentStreamId) {

    if (outSurfaceMap->find(mDepthStreamId) == outSurfaceMap->end()) {

        (*outSurfaceMap)[mDepthStreamId] = std::vector<size_t>();

        outputStreamIds->push_back(mDepthStreamId);

    }

    (*outSurfaceMap)[mDepthStreamId].push_back(mDepthSurfaceId);



    if (outSurfaceMap->find(mBlobStreamId) == outSurfaceMap->end()) {

        (*outSurfaceMap)[mBlobStreamId] = std::vector<size_t>();

        outputStreamIds->push_back(mBlobStreamId);

    }

    (*outSurfaceMap)[mBlobStreamId].push_back(mBlobSurfaceId);

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+0 −2
Original line number Diff line number Diff line
@@ -521,13 +521,11 @@ status_t HeicCompositeStream::configureStream() { 
status_t HeicCompositeStream::insertGbp(SurfaceMap* /*out*/outSurfaceMap,

        Vector<int32_t>* /*out*/outputStreamIds, int32_t* /*out*/currentStreamId) {

    if (outSurfaceMap->find(mAppSegmentStreamId) == outSurfaceMap->end()) {

        (*outSurfaceMap)[mAppSegmentStreamId] = std::vector<size_t>();

        outputStreamIds->push_back(mAppSegmentStreamId);

    }

    (*outSurfaceMap)[mAppSegmentStreamId].push_back(mAppSegmentSurfaceId);



    if (outSurfaceMap->find(mMainImageStreamId) == outSurfaceMap->end()) {

        (*outSurfaceMap)[mMainImageStreamId] = std::vector<size_t>();

        outputStreamIds->push_back(mMainImageStreamId);

    }

    (*outSurfaceMap)[mMainImageStreamId].push_back(mMainImageSurfaceId);