Loading camera/Android.bp +1 −0 Original line number Diff line number Diff line Loading @@ -85,6 +85,7 @@ filegroup { "aidl/android/hardware/ICameraServiceProxy.aidl", "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl", "aidl/android/hardware/camera2/ICameraDeviceUser.aidl", "aidl/android/hardware/camera2/ICameraOfflineSession.aidl", ], path: "aidl", } Loading camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl +13 −0 Original line number Diff line number Diff line Loading @@ -17,6 +17,8 @@ package android.hardware.camera2; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.ICameraDeviceCallbacks; import android.hardware.camera2.ICameraOfflineSession; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.params.SessionConfiguration; Loading Loading @@ -177,4 +179,15 @@ interface ICameraDeviceUser * @return the currently applied system-wide audio restriction mode */ int getGlobalAudioRestriction(); /** * Offline processing main entry point * * @param callbacks Object that will receive callbacks from offline session * @param offlineOutputIds The ID of streams that needs to be preserved in offline session * * @return Offline session object. */ ICameraOfflineSession switchToOffline(in ICameraDeviceCallbacks callbacks, in Surface[] offlineOutputs); } camera/aidl/android/hardware/camera2/ICameraOfflineSession.aidl 0 → 100644 +23 −0 Original line number Diff line number Diff line /* * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package android.hardware.camera2; /** @hide */ interface ICameraOfflineSession { void disconnect(); } camera/ndk/include/camera/NdkCameraMetadataTags.h +1 −1 Original line number Diff line number Diff line Loading @@ -1311,7 +1311,7 @@ typedef enum acamera_metadata_tag { /** * <p>List of the maximum number of regions that can be used for metering in * auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF); * this corresponds to the the maximum number of elements in * this corresponds to the maximum number of elements in * ACAMERA_CONTROL_AE_REGIONS, ACAMERA_CONTROL_AWB_REGIONS, * and ACAMERA_CONTROL_AF_REGIONS.</p> * Loading services/camera/libcameraservice/Android.bp +3 −0 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ cc_library_shared { "CameraFlashlight.cpp", "common/Camera2ClientBase.cpp", "common/CameraDeviceBase.cpp", "common/CameraOfflineSessionBase.cpp", "common/CameraProviderManager.cpp", "common/FrameProcessorBase.cpp", "api1/CameraClient.cpp", Loading @@ -45,6 +46,7 @@ cc_library_shared { "api2/HeicCompositeStream.cpp", "device1/CameraHardwareInterface.cpp", "device3/Camera3Device.cpp", "device3/Camera3OfflineSession.cpp", "device3/Camera3Stream.cpp", "device3/Camera3IOStreamBase.cpp", "device3/Camera3InputStream.cpp", Loading Loading @@ -110,6 +112,7 @@ cc_library_shared { "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", "android.hardware.camera.device@3.5", "android.hardware.camera.device@3.6" ], export_shared_lib_headers: [ Loading Loading
camera/Android.bp +1 −0 Original line number Diff line number Diff line Loading @@ -85,6 +85,7 @@ filegroup { "aidl/android/hardware/ICameraServiceProxy.aidl", "aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl", "aidl/android/hardware/camera2/ICameraDeviceUser.aidl", "aidl/android/hardware/camera2/ICameraOfflineSession.aidl", ], path: "aidl", } Loading
camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl +13 −0 Original line number Diff line number Diff line Loading @@ -17,6 +17,8 @@ package android.hardware.camera2; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.ICameraDeviceCallbacks; import android.hardware.camera2.ICameraOfflineSession; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.params.OutputConfiguration; import android.hardware.camera2.params.SessionConfiguration; Loading Loading @@ -177,4 +179,15 @@ interface ICameraDeviceUser * @return the currently applied system-wide audio restriction mode */ int getGlobalAudioRestriction(); /** * Offline processing main entry point * * @param callbacks Object that will receive callbacks from offline session * @param offlineOutputIds The ID of streams that needs to be preserved in offline session * * @return Offline session object. */ ICameraOfflineSession switchToOffline(in ICameraDeviceCallbacks callbacks, in Surface[] offlineOutputs); }
camera/aidl/android/hardware/camera2/ICameraOfflineSession.aidl 0 → 100644 +23 −0 Original line number Diff line number Diff line /* * Copyright (C) 2019 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package android.hardware.camera2; /** @hide */ interface ICameraOfflineSession { void disconnect(); }
camera/ndk/include/camera/NdkCameraMetadataTags.h +1 −1 Original line number Diff line number Diff line Loading @@ -1311,7 +1311,7 @@ typedef enum acamera_metadata_tag { /** * <p>List of the maximum number of regions that can be used for metering in * auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF); * this corresponds to the the maximum number of elements in * this corresponds to the maximum number of elements in * ACAMERA_CONTROL_AE_REGIONS, ACAMERA_CONTROL_AWB_REGIONS, * and ACAMERA_CONTROL_AF_REGIONS.</p> * Loading
services/camera/libcameraservice/Android.bp +3 −0 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ cc_library_shared { "CameraFlashlight.cpp", "common/Camera2ClientBase.cpp", "common/CameraDeviceBase.cpp", "common/CameraOfflineSessionBase.cpp", "common/CameraProviderManager.cpp", "common/FrameProcessorBase.cpp", "api1/CameraClient.cpp", Loading @@ -45,6 +46,7 @@ cc_library_shared { "api2/HeicCompositeStream.cpp", "device1/CameraHardwareInterface.cpp", "device3/Camera3Device.cpp", "device3/Camera3OfflineSession.cpp", "device3/Camera3Stream.cpp", "device3/Camera3IOStreamBase.cpp", "device3/Camera3InputStream.cpp", Loading Loading @@ -110,6 +112,7 @@ cc_library_shared { "android.hardware.camera.device@3.3", "android.hardware.camera.device@3.4", "android.hardware.camera.device@3.5", "android.hardware.camera.device@3.6" ], export_shared_lib_headers: [ Loading