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

Commit f0b35a84 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "OfflineReproc-impl" 

* changes:
  Camera: Propagate all offline stream ids to clients
  Camera: Add initial offline client listener logic
  Camera: Initial support for composite streams in offline mode
  Camera: Initial offline session client
  Camera: fill in Camera3Device offline processing impl
parents 2c5b3c2f cc0b795a

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

+3 −2
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
@@ -189,5 +190,5 @@ interface ICameraDeviceUser 
     * @return Offline session object.

     */

    ICameraOfflineSession switchToOffline(in ICameraDeviceCallbacks callbacks,

            in Surface[] offlineOutputs);

            in int[] offlineOutputIds);

}

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/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -41,11 +41,13 @@ cc_library_shared { 
        "api1/client2/CaptureSequencer.cpp",

        "api1/client2/ZslProcessor.cpp",

        "api2/CameraDeviceClient.cpp",

        "api2/CameraOfflineSessionClient.cpp",

        "api2/CompositeStream.cpp",

        "api2/DepthCompositeStream.cpp",

        "api2/HeicEncoderInfoManager.cpp",

        "api2/HeicCompositeStream.cpp",

        "device1/CameraHardwareInterface.cpp",

        "device3/BufferUtils.cpp",

        "device3/Camera3Device.cpp",

        "device3/Camera3OfflineSession.cpp",

        "device3/Camera3Stream.cpp",
@@ -60,6 +62,8 @@ cc_library_shared { 
        "device3/CoordinateMapper.cpp",

        "device3/DistortionMapper.cpp",

        "device3/ZoomRatioMapper.cpp",

        "device3/Camera3OutputStreamInterface.cpp",

        "device3/Camera3OutputUtils.cpp",

        "gui/RingBufferConsumer.cpp",

        "utils/CameraThreadState.cpp",

        "hidl/AidlCameraDeviceCallbacks.cpp",

services/camera/libcameraservice/CameraService.cpp

+109 −30
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static const String16 
static constexpr int32_t kVendorClientScore = 200;

// Matches with PROCESS_STATE_PERSISTENT_UI in ActivityManager.java

static constexpr int32_t kVendorClientState = 1;

const String8 CameraService::kOfflineDevice("offline-");



Mutex CameraService::sProxyMutex;

sp<hardware::ICameraServiceProxy> CameraService::sCameraServiceProxy;
@@ -394,7 +395,7 @@ void CameraService::onDeviceStatusChanged(const String8& id, 
        // to this device until the status changes

        updateStatus(StatusInternal::NOT_PRESENT, id);



        sp<BasicClient> clientToDisconnect;

        sp<BasicClient> clientToDisconnectOnline, clientToDisconnectOffline;

        {

            // Don't do this in updateStatus to avoid deadlock over mServiceLock

            Mutex::Autolock lock(mServiceLock);
@@ -402,11 +403,27 @@ void CameraService::onDeviceStatusChanged(const String8& id, 
            // Remove cached shim parameters

            state->setShimParams(CameraParameters());



            // Remove the client from the list of active clients, if there is one

            clientToDisconnect = removeClientLocked(id);

            // Remove online as well as offline client from the list of active clients,

            // if they are present

            clientToDisconnectOnline = removeClientLocked(id);

            clientToDisconnectOffline = removeClientLocked(kOfflineDevice + id);

        }



        // Disconnect client

        disconnectClient(id, clientToDisconnectOnline);

        disconnectClient(kOfflineDevice + id, clientToDisconnectOffline);



        removeStates(id);

    } else {

        if (oldStatus == StatusInternal::NOT_PRESENT) {

            logDeviceAdded(id, String8::format("Device status changed from %d to %d", oldStatus,

                    newStatus));

        }

        updateStatus(newStatus, id);

    }



}



void CameraService::disconnectClient(const String8& id, sp<BasicClient> clientToDisconnect) {

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

        ALOGI("%s: Client for camera ID %s evicted due to device status change from HAL",

                __FUNCTION__, id.string());
@@ -419,16 +436,6 @@ void CameraService::onDeviceStatusChanged(const String8& id, 
                "onDeviceStatusChanged must be called from the camera service process!");

        clientToDisconnect->disconnect();

    }



        removeStates(id);

    } else {

        if (oldStatus == StatusInternal::NOT_PRESENT) {

            logDeviceAdded(id, String8::format("Device status changed from %d to %d", oldStatus,

                    newStatus));

        }

        updateStatus(newStatus, id);

    }



}



void CameraService::onTorchStatusChanged(const String8& cameraId,
@@ -1696,6 +1703,77 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8& 
    return ret;

}



status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offlineClient) {

    if (offlineClient.get() == nullptr) {

        return BAD_VALUE;

    }



    {

        // Acquire mServiceLock and prevent other clients from connecting

        std::unique_ptr<AutoConditionLock> lock =

                AutoConditionLock::waitAndAcquire(mServiceLockWrapper, DEFAULT_CONNECT_TIMEOUT_NS);



        if (lock == nullptr) {

            ALOGE("%s: (PID %d) rejected (too many other clients connecting)."

                    , __FUNCTION__, offlineClient->getClientPid());

            return TIMED_OUT;

        }



        auto onlineClientDesc = mActiveClientManager.get(cameraId);

        if (onlineClientDesc.get() == nullptr) {

            ALOGE("%s: No active online client using camera id: %s", __FUNCTION__,

                    cameraId.c_str());

            return BAD_VALUE;

        }



        // Offline clients do not evict or conflict with other online devices. Resource sharing

        // conflicts are handled by the camera provider which will either succeed or fail before

        // reaching this method.

        const auto& onlinePriority = onlineClientDesc->getPriority();

        auto offlineClientDesc = CameraClientManager::makeClientDescriptor(

                kOfflineDevice + onlineClientDesc->getKey(), offlineClient, /*cost*/ 0,

                /*conflictingKeys*/ std::set<String8>(), onlinePriority.getScore(),

                onlineClientDesc->getOwnerId(), onlinePriority.getState());



        // Allow only one offline device per camera

        auto incompatibleClients = mActiveClientManager.getIncompatibleClients(offlineClientDesc);

        if (!incompatibleClients.empty()) {

            ALOGE("%s: Incompatible offline clients present!", __FUNCTION__);

            return BAD_VALUE;

        }



        auto err = offlineClient->initialize(mCameraProviderManager, mMonitorTags);

        if (err != OK) {

            ALOGE("%s: Could not initialize offline client.", __FUNCTION__);

            return err;

        }



        auto evicted = mActiveClientManager.addAndEvict(offlineClientDesc);

        if (evicted.size() > 0) {

            for (auto& i : evicted) {

                ALOGE("%s: Invalid state: Offline client for camera %s was not removed ",

                        __FUNCTION__, i->getKey().string());

            }



            LOG_ALWAYS_FATAL("%s: Invalid state for CameraService, offline clients not evicted "

                    "properly", __FUNCTION__);



            return BAD_VALUE;

        }



        logConnectedOffline(offlineClientDesc->getKey(),

                static_cast<int>(offlineClientDesc->getOwnerId()),

                String8(offlineClient->getPackageName()));



        sp<IBinder> remoteCallback = offlineClient->getRemote();

        if (remoteCallback != nullptr) {

            remoteCallback->linkToDeath(this);

        }

    } // lock is destroyed, allow further connect calls



    return OK;

}



Status CameraService::setTorchMode(const String16& cameraId, bool enabled,

        const sp<IBinder>& clientBinder) {

    Mutex::Autolock lock(mServiceLock);
@@ -2300,6 +2378,13 @@ void CameraService::logDisconnected(const char* cameraId, int clientPid, 
            clientPackage, clientPid));

}



void CameraService::logDisconnectedOffline(const char* cameraId, int clientPid,

        const char* clientPackage) {

    // Log the clients evicted

    logEvent(String8::format("DISCONNECT offline device %s client for package %s (PID %d)",

                cameraId, clientPackage, clientPid));

}



void CameraService::logConnected(const char* cameraId, int clientPid,

        const char* clientPackage) {

    // Log the clients evicted
@@ -2307,6 +2392,13 @@ void CameraService::logConnected(const char* cameraId, int clientPid, 
            clientPackage, clientPid));

}



void CameraService::logConnectedOffline(const char* cameraId, int clientPid,

        const char* clientPackage) {

    // Log the clients evicted

    logEvent(String8::format("CONNECT offline device %s client for package %s (PID %d)", cameraId,

            clientPackage, clientPid));

}



void CameraService::logRejected(const char* cameraId, int clientPid,

        const char* clientPackage, const char* reason) {

    // Log the client rejected
@@ -2744,6 +2836,7 @@ void CameraService::BasicClient::opChanged(int32_t op, const String16&) { 
    if (mAppOpsManager == nullptr) {

        return;

    }

    // TODO : add offline camera session case

    if (op != AppOpsManager::OP_CAMERA) {

        ALOGW("Unexpected app ops notification received: %d", op);

        return;
@@ -2778,20 +2871,6 @@ void CameraService::BasicClient::block() { 


// ----------------------------------------------------------------------------



sp<CameraService> CameraService::OfflineClient::sCameraService;



status_t CameraService::OfflineClient::startCameraOps() {

    // TODO

    return OK;

}



status_t CameraService::OfflineClient::finishCameraOps() {

    // TODO

    return OK;

}



// ----------------------------------------------------------------------------



void CameraService::Client::notifyError(int32_t errorCode,

        const CaptureResultExtras& resultExtras) {

    (void) resultExtras;