Merge "Camera: new buffer management HIDL APIs" (8ffafc60) · Commits · e / os / android_hardware_interfaces

camera/device/3.2/ICameraDevice.hal

+3 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,9 @@ interface ICameraDevice {
		* session handle for active operations.
		*
		* @param callback Interface to invoke by the HAL for device asynchronous
		* events.
		* events. For HALs newer than version 3.2, HAL must use castFrom
		* method to check the exact version of callback sent by camera service.
		*
		* @return status Status code for the operation, one of:
		* OK:
		* On a successful open of the camera device.

camera/device/3.2/ICameraDeviceSession.hal

+2 −3

Original line number	Diff line number	Diff line
		@@ -149,9 +149,8 @@ interface ICameraDeviceSession {
		* - Including too many output streams of a certain format.
		* - Unsupported rotation configuration
		* - Stream sizes/formats don't satisfy the
		* camera3_stream_configuration_t->operation_mode requirements
		* for non-NORMAL mode, or the requested operation_mode is not
		* supported by the HAL.
		* StreamConfigurationMode requirements for non-NORMAL mode, or
		* the requested operation_mode is not supported by the HAL.
		* - Unsupported usage flag
		* The camera service cannot filter out all possible illegal stream
		* configurations, since some devices may support more simultaneous

camera/device/3.4/ICameraDeviceSession.hal

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ interface ICameraDeviceSession extends @3.3::ICameraDeviceSession {
		* - Including too many output streams of a certain format.
		* - Unsupported rotation configuration
		* - Stream sizes/formats don't satisfy the
		* camera3_stream_configuration_t->operation_mode requirements
		* StreamConfigurationMode requirements
		* for non-NORMAL mode, or the requested operation_mode is not
		* supported by the HAL.
		* - Unsupported usage flag

camera/device/3.5/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -7,7 +7,9 @@ hidl_interface {
		enabled: true,
		},
		srcs: [
		"types.hal",
		"ICameraDevice.hal",
		"ICameraDeviceCallback.hal",
		"ICameraDeviceSession.hal",
		],
		interfaces: [
		@@ -18,6 +20,14 @@ hidl_interface {
		"android.hardware.graphics.common@1.0",
		"android.hidl.base@1.0",
		],
		types: [
		"BufferRequest",
		"BufferRequestStatus",
		"StreamBufferRequestError",
		"StreamBufferRet",
		"StreamBuffersVal",
		"StreamConfiguration",
		],
		gen_java: false,
		}

camera/device/3.5/ICameraDeviceCallback.hal

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.camera.device@3.5;

		import @3.2::StreamBuffer;
		import @3.4::ICameraDeviceCallback;

		/**
		* Callback methods for the HAL to call into the framework.
		*/
		interface ICameraDeviceCallback extends @3.4::ICameraDeviceCallback {

		/**
		* requestStreamBuffers:
		*
		* Synchronous callback for HAL to ask for output buffers from camera service.
		*
		* This call may be serialized in camera service so it is strongly
		* recommended to only call this method from one thread.
		*
		* When camera device advertises
		* (CameraMetadataEnumAndroidInfoSupportedBufferManagementVersion ==
		* ANDROID_INFO_SUPPORTED_BUFFER_MANAGEMENT_VERSION_HIDL_DEVICE_3_5), HAL
		* can use this method to request buffers from camera service.
		*
		* @return status Status code for the operation, one of:
		* OK: all requested buffers are returned
		* FAILED_PARTIAL: some streams failed while some succeeds. Check
		* individual StreamBufferRet for details.
		* FAILED_CONFIGURING: the request failed because camera servicve is
		* performing configureStreams and no buffers are returned.
		* FAILED_UNKNOWN: the request failed for unknown reason and no buffers
		* are returned.
		*
		* Performance requirements:
		* This is a blocking call that takes more time with more buffers requested.
		* HAL must not request large amount of buffers on a latency critical code
		* path. It is highly recommended to use a dedicated thread to perform
		* all requestStreamBuffers calls, and adjust the thread priority and/or
		* timing of making the call in order for buffers to arrive before HAL is
		* ready to fill the buffer.
		*/
		requestStreamBuffers(vec<BufferRequest> bufReqs)
		generates (BufferRequestStatus st, vec<StreamBufferRet> buffers);

		/**
		* returnStreamBuffers:
		*
		* Synchronous callback for HAL to return output buffers to camera service.
		*
		* If this method is called during a configureStreams call, it must be blocked
		* until camera service finishes the ongoing configureStreams call.
		*/
		returnStreamBuffers(vec<StreamBuffer> buffers);

		};