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/CameraOfflineSessionClient.h

diff --git a/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h b/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h
index 0bb1400..e92a05c 100644
--- a/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h
+++ b/services/camera/libcameraservice/api2/CameraOfflineSessionClient.h
@@ -20,10 +20,12 @@
 #include <android/hardware/camera2/BnCameraOfflineSession.h>
 #include <android/hardware/camera2/ICameraDeviceCallbacks.h>
 #include "CameraService.h"
+#include "CompositeStream.h"
 
 namespace android {
 
 using android::hardware::camera2::ICameraDeviceCallbacks;
+using camera3::CompositeStream;
 
 // Client for offline session. Note that offline session client does not affect camera service's
 // client arbitration logic. It is camera HAL's decision to decide whether a normal camera
@@ -40,6 +42,7 @@
     CameraOfflineSessionClient(
             const sp<CameraService>& cameraService,
             sp<CameraOfflineSessionBase> session,
+            const KeyedVector<sp<IBinder>, sp<CompositeStream>>& offlineCompositeStreamMap,
             const sp<ICameraDeviceCallbacks>& remoteCallback,
             const String16& clientPackageName,
             const std::unique_ptr<String16>& clientFeatureId,
@@ -50,7 +53,8 @@
                     IInterface::asBinder(remoteCallback),
                     clientPackageName, clientFeatureId,
                     cameraIdStr, cameraFacing, clientPid, clientUid, servicePid),
-            mRemoteCallback(remoteCallback), mOfflineSession(session) {}
+            mRemoteCallback(remoteCallback), mOfflineSession(session),
+            mCompositeStreamMap(offlineCompositeStreamMap) {}
 
     virtual ~CameraOfflineSessionClient() {}
 
@@ -74,6 +78,11 @@
     virtual status_t startCameraOps() override;
     virtual status_t finishCameraOps() override;
 
+    // TODO: Those will be introduced when we implement FilteredListener and the device
+    // callbacks respectively. Just adding for now.
+    void onResultAvailable(const CaptureResult& result);
+    void notifyShutter(const CaptureResultExtras& resultExtras, nsecs_t timestamp);
+
 private:
 
     const sp<hardware::camera2::ICameraDeviceCallbacks>& getRemoteCallback() {
@@ -83,6 +92,9 @@
     sp<hardware::camera2::ICameraDeviceCallbacks> mRemoteCallback;
 
     sp<CameraOfflineSessionBase> mOfflineSession;
+
+    // Offline composite streams
+    KeyedVector<sp<IBinder>, sp<CompositeStream>> mCompositeStreamMap;
 };
 
 } // namespace android