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

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

Camera: Propagate all offline stream ids to clients 

Camera clients must be aware of any configured streams
that can support offline processing mode.
A few corner cases that need to be considered:
 - Composite streams can support offline mode only
   when all internal streams support it as well.
 - Streams that use the internal camera buffer manager
   will not have support for offline mode.
 - Shared streams are also unsupported in offline mode.

Bug: 135142453
Test: Camera CTS
Change-Id: Idde826a6fb18a8907850e87cfe593de7cb1c5f4a
parent d99c8ae8

camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl

+2 −1
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ interface ICameraDeviceUser 
     * @param operatingMode The kind of session to create; either NORMAL_MODE or

     *     CONSTRAINED_HIGH_SPEED_MODE. Must be a non-negative value.

     * @param sessionParams Session wide camera parameters

     * @return a list of stream ids that can be used in offline mode via "switchToOffline"

     */

    void endConfigure(int operatingMode, in CameraMetadataNative sessionParams);

    int[] endConfigure(int operatingMode, in CameraMetadataNative sessionParams);



    /**

      * Check whether a particular session configuration has camera device

camera/ndk/impl/ACameraDevice.cpp

+2 −1
Original line number Diff line number Diff line
@@ -710,7 +710,8 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu 
    if ((sessionParameters != nullptr) && (sessionParameters->settings != nullptr)) {

        params.append(sessionParameters->settings->getInternalData());

    }

    remoteRet = mRemote->endConfigure(/*isConstrainedHighSpeed*/ false, params);

    std::vector<int> offlineStreamIds;

    remoteRet = mRemote->endConfigure(/*isConstrainedHighSpeed*/ false, params, &offlineStreamIds);

    if (remoteRet.serviceSpecificErrorCode() == hardware::ICameraService::ERROR_ILLEGAL_ARGUMENT) {

        ALOGE("Camera device %s cannnot support app output configuration: %s", getId(),

                remoteRet.toString8().string());

camera/tests/CameraBinderTests.cpp

+5 −2
Original line number Diff line number Diff line
@@ -498,7 +498,9 @@ TEST_F(CameraClientBinderTest, CheckBinderCameraDeviceUser) { 
        EXPECT_TRUE(res.isOk()) << res;

        EXPECT_LE(0, streamId);

        CameraMetadata sessionParams;

        res = device->endConfigure(/*isConstrainedHighSpeed*/ false, sessionParams);

        std::vector<int> offlineStreamIds;

        res = device->endConfigure(/*isConstrainedHighSpeed*/ false, sessionParams,

                &offlineStreamIds);

        EXPECT_TRUE(res.isOk()) << res;

        EXPECT_FALSE(callbacks->hadError());
@@ -609,7 +611,8 @@ TEST_F(CameraClientBinderTest, CheckBinderCameraDeviceUser) { 
        EXPECT_TRUE(res.isOk()) << res;

        res = device->deleteStream(streamId);

        EXPECT_TRUE(res.isOk()) << res;

        res = device->endConfigure(/*isConstrainedHighSpeed*/ false, sessionParams);

        res = device->endConfigure(/*isConstrainedHighSpeed*/ false, sessionParams,

                &offlineStreamIds);

        EXPECT_TRUE(res.isOk()) << res;



        sleep(/*second*/1); // allow some time for errors to show up, if any

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+53 −9
Original line number Diff line number Diff line
@@ -470,7 +470,8 @@ binder::Status CameraDeviceClient::beginConfigure() { 
}



binder::Status CameraDeviceClient::endConfigure(int operatingMode,

        const hardware::camera2::impl::CameraMetadataNative& sessionParams) {

        const hardware::camera2::impl::CameraMetadataNative& sessionParams,

        std::vector<int>* offlineStreamIds /*out*/) {

    ATRACE_CALL();

    ALOGV("%s: ending configure (%d input stream, %zu output surfaces)",

            __FUNCTION__, mInputStream.configured ? 1 : 0,
@@ -479,6 +480,12 @@ binder::Status CameraDeviceClient::endConfigure(int operatingMode, 
    binder::Status res;

    if (!(res = checkPidStatus(__FUNCTION__)).isOk()) return res;



    if (offlineStreamIds == nullptr) {

        String8 msg = String8::format("Invalid offline stream ids");

        ALOGE("%s: %s", __FUNCTION__, msg.string());

        return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());

    }



    Mutex::Autolock icl(mBinderSerializationLock);



    if (!mDevice.get()) {
@@ -502,6 +509,9 @@ binder::Status CameraDeviceClient::endConfigure(int operatingMode, 
        ALOGE("%s: %s", __FUNCTION__, msg.string());

        res = STATUS_ERROR(CameraService::ERROR_INVALID_OPERATION, msg.string());

    } else {

        offlineStreamIds->clear();

        mDevice->getOfflineStreamIds(offlineStreamIds);



        for (size_t i = 0; i < mCompositeStreamMap.size(); ++i) {

            err = mCompositeStreamMap.valueAt(i)->configureStream();

            if (err != OK) {
@@ -511,6 +521,29 @@ binder::Status CameraDeviceClient::endConfigure(int operatingMode, 
                res = STATUS_ERROR(CameraService::ERROR_INVALID_OPERATION, msg.string());

                break;

            }



            // Composite streams can only support offline mode in case all individual internal

            // streams are also supported.

            std::vector<int> internalStreams;

            mCompositeStreamMap.valueAt(i)->insertCompositeStreamIds(&internalStreams);

            std::remove_if(offlineStreamIds->begin(), offlineStreamIds->end(),

                    [&internalStreams] (int streamId) {

                        auto it = std::find(internalStreams.begin(), internalStreams.end(),

                                streamId);

                        if (it != internalStreams.end()) {

                            internalStreams.erase(it);

                            return true;

                        }



                        return false;

                    });

            if (internalStreams.empty()) {

                offlineStreamIds->push_back(mCompositeStreamMap.valueAt(i)->getStreamId());

            }

        }



        for (const auto& offlineStreamId : *offlineStreamIds) {

            mStreamInfoMap[offlineStreamId].supportsOffline = true;

        }

    }
@@ -1918,7 +1951,7 @@ binder::Status CameraDeviceClient::switchToOffline( 
    }



    if (offlineOutputIds.empty()) {

        String8 msg = String8::format("Offline outputs must not be empty");

        String8 msg = String8::format("Offline surfaces must not be empty");

        ALOGE("%s: %s", __FUNCTION__, msg.string());

        return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());

    }
@@ -1934,11 +1967,18 @@ binder::Status CameraDeviceClient::switchToOffline( 
    for (const auto& streamId : offlineOutputIds) {

        ssize_t index = mConfiguredOutputs.indexOfKey(streamId);

        if (index == NAME_NOT_FOUND) {

            String8 msg = String8::format("Offline output is invalid");

            String8 msg = String8::format("Offline surface with id: %d is not registered",

                    streamId);

            ALOGE("%s: %s", __FUNCTION__, msg.string());

            return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());

        }



        if (!mStreamInfoMap[streamId].supportsOffline) {

            String8 msg = String8::format("Offline surface with id: %d doesn't support "

                    "offline mode", streamId);

            ALOGE("%s: %s", __FUNCTION__, msg.string());

            return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT, msg.string());

        }

        // TODO: Also check whether the offline output is supported by Hal for offline mode.



        bool isCompositeStream = false;

        for (const auto& gbp : mConfiguredOutputs[streamId].getGraphicBufferProducers()) {
@@ -1974,10 +2014,14 @@ binder::Status CameraDeviceClient::switchToOffline( 
                mCameraIdStr.string(), strerror(ret), ret);

    }



    sp<CameraOfflineSessionClient> offlineClient = new CameraOfflineSessionClient(sCameraService,

    sp<CameraOfflineSessionClient> offlineClient;

    if (offlineSession.get() != nullptr) {

        offlineClient = new CameraOfflineSessionClient(sCameraService,

                offlineSession, offlineCompositeStreamMap, cameraCb, mClientPackageName,

                mClientFeatureId, mCameraIdStr, mCameraFacing, mClientPid, mClientUid, mServicePid);

        ret = sCameraService->addOfflineClient(mCameraIdStr, offlineClient);

    }



    if (ret == OK) {

        // A successful offline session switch must reset the current camera client

        // and release any resources occupied by previously configured streams.

services/camera/libcameraservice/api2/CameraDeviceClient.h

+3 −1
Original line number Diff line number Diff line
@@ -92,7 +92,9 @@ public: 
    virtual binder::Status beginConfigure() override;



    virtual binder::Status endConfigure(int operatingMode,

            const hardware::camera2::impl::CameraMetadataNative& sessionParams) override;

            const hardware::camera2::impl::CameraMetadataNative& sessionParams,

            /*out*/

            std::vector<int>* offlineStreamIds) override;



    // Verify specific session configuration.

    virtual binder::Status isSessionConfigurationSupported(