commit 4697b64a3b853898ec26e6397eacc3d8bb486473
author Emilian Peev <epeev@google.com> Tue Nov 19 17:11:14 2019 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Jan 21 13:23:08 2020 -0800
tree 94bedc5c648e367f9ca43df62c5915b08c22a186
parent b2bc5a46efe3e77a5962ba0f2f770c524e93e03f

Camera: Initial support for composite streams in offline mode

Composite streams must be able to switch to offline processing
mode. To support them the offline session client must continue
passing all necessary callbacks and events similar to regular
camera clients.

Test: Camera CTS
Bug: 135142453
Change-Id: I498681af16ad072e3df01d0279b4cfe76b48f9ec

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index f618b2e..e7e72b2 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -1930,6 +1930,7 @@
     }
 
     std::vector<int32_t> offlineStreamIds(offlineOutputIds.size());
+    KeyedVector<sp<IBinder>, sp<CompositeStream>> offlineCompositeStreamMap;
     for (const auto& streamId : offlineOutputIds) {
         ssize_t index = mConfiguredOutputs.indexOfKey(streamId);
         if (index == NAME_NOT_FOUND) {
@@ -1944,11 +1945,23 @@
             sp<Surface> s = new Surface(gbp, false /*controlledByApp*/);
             isCompositeStream = camera3::DepthCompositeStream::isDepthCompositeStream(s) |
                 camera3::HeicCompositeStream::isHeicCompositeStream(s);
+            if (isCompositeStream) {
+                auto compositeIdx = mCompositeStreamMap.indexOfKey(IInterface::asBinder(gbp));
+                if (compositeIdx == NAME_NOT_FOUND) {
+                    ALOGE("%s: Unknown composite stream", __FUNCTION__);
+                    return STATUS_ERROR(CameraService::ERROR_ILLEGAL_ARGUMENT,
+                            "Unknown composite stream");
+                }
+
+                mCompositeStreamMap.valueAt(compositeIdx)->insertCompositeStreamIds(
+                        &offlineStreamIds);
+                offlineCompositeStreamMap.add(mCompositeStreamMap.keyAt(compositeIdx),
+                        mCompositeStreamMap.valueAt(compositeIdx));
+                break;
+            }
         }
 
-        if (isCompositeStream) {
-            // TODO: Add composite specific handling
-        } else {
+        if (!isCompositeStream) {
             offlineStreamIds.push_back(streamId);
         }
     }
@@ -1962,11 +1975,11 @@
     }
 
     sp<CameraOfflineSessionClient> offlineClient = new CameraOfflineSessionClient(sCameraService,
-            offlineSession, cameraCb, mClientPackageName, mClientFeatureId, mCameraIdStr,
-            mCameraFacing, mClientPid, mClientUid, mServicePid);
+            offlineSession, offlineCompositeStreamMap, cameraCb, mClientPackageName,
+            mClientFeatureId, mCameraIdStr, mCameraFacing, mClientPid, mClientUid, mServicePid);
     ret = sCameraService->addOfflineClient(mCameraIdStr, offlineClient);
     if (ret == OK) {
-        // TODO: We need to update mStreamMap, mConfiguredOutputs
+        // TODO: We need to update mStreamMap, mConfiguredOutputs, mCompositeStreams
     } else {
         switch(ret) {
             case BAD_VALUE: