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

Commit 87fcccad authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Emilian Peev
Browse files

Camera: some patchs for offline processing 

Test: CTS OfflineSessionTest
Bug: 135142453

Change-Id: I09a19b3b2e366855ed35b588f75f9734f505072c
parent 2496ffbc

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2005,7 +2005,8 @@ binder::Status CameraDeviceClient::switchToOffline( 
        return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());

    }



    std::vector<int32_t> offlineStreamIds(offlineOutputIds.size());

    std::vector<int32_t> offlineStreamIds;

    offlineStreamIds.reserve(offlineOutputIds.size());

    KeyedVector<sp<IBinder>, sp<CompositeStream>> offlineCompositeStreamMap;

    for (const auto& streamId : offlineOutputIds) {

        ssize_t index = mConfiguredOutputs.indexOfKey(streamId);

services/camera/libcameraservice/device3/Camera3OfflineSession.cpp

+3 −1
Original line number Diff line number Diff line
@@ -167,7 +167,9 @@ status_t Camera3OfflineSession::disconnectImpl() { 
        streams.push_back(mInputStream);

    }



    if (mSession != nullptr) {

        mSession->close();

    }



    FlushInflightReqStates states {

        mId, mOfflineReqsLock, mOfflineReqs, mUseHalBufManager,

services/camera/libcameraservice/device3/ZoomRatioMapper.h

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ class ZoomRatioMapper : private CoordinateMapper { 
            bool supportNativeZoomRatio, bool usePrecorrectArray);

    ZoomRatioMapper(const ZoomRatioMapper& other) :

            mHalSupportsZoomRatio(other.mHalSupportsZoomRatio),

            mArrayWidth(other.mArrayWidth), mArrayHeight(other.mArrayHeight) {}

            mArrayWidth(other.mArrayWidth), mArrayHeight(other.mArrayHeight),

            mIsValid(other.mIsValid) {}



    /**

     * Initialize request template with valid zoomRatio if necessary.