Merge "camera.device@3.4/metadata@3.3: Revise MOTION_TRACKING capability" (fdb6dd5c) · Commits · e / os / android_hardware_interfaces

camera/device/3.4/ICameraDeviceSession.hal

+0 −37

Original line number	Diff line number	Diff line
		@@ -30,43 +30,6 @@ import @3.2::BufferCache;
		*/
		interface ICameraDeviceSession extends @3.3::ICameraDeviceSession {

		/**
		* constructDefaultRequestSettings_3_4:
		*
		* Create capture settings for standard camera use cases. Supports the
		* new template enums added in @3.4.
		*
		* The device must return a settings buffer that is configured to meet the
		* requested use case, which must be one of the CAMERA3_TEMPLATE_*
		* enums. All request control fields must be included.
		*
		* Performance requirements:
		*
		* This must be a non-blocking call. The HAL should return from this call
		* in 1ms, and must return from this call in 5ms.
		*
		* Return values:
		* @return status Status code for the operation, one of:
		* OK:
		* On a successful construction of default settings.
		* INTERNAL_ERROR:
		* An unexpected internal error occurred, and the default settings
		* are not available.
		* ILLEGAL_ARGUMENT:
		* The camera HAL does not support the input template type
		* CAMERA_DISCONNECTED:
		* An external camera device has been disconnected, and is no longer
		* available. This camera device interface is now stale, and a new
		* instance must be acquired if the device is reconnected. All
		* subsequent calls on this interface must return
		* CAMERA_DISCONNECTED.
		* @return requestTemplate The default capture request settings for the requested
		* use case, or an empty metadata structure if status is not OK.
		*
		*/
		constructDefaultRequestSettings_3_4(RequestTemplate type) generates
		(Status status, @3.2::CameraMetadata requestTemplate);

		/**
		* configureStreams_3_4:
		*

camera/device/3.4/default/CameraDeviceSession.cpp

+0 −8

Original line number	Diff line number	Diff line
		@@ -56,14 +56,6 @@ CameraDeviceSession::CameraDeviceSession(
		CameraDeviceSession::~CameraDeviceSession() {
		}

		Return<void> CameraDeviceSession::constructDefaultRequestSettings_3_4(
		RequestTemplate type, ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb) {
		V3_2::CameraMetadata outMetadata;
		Status status = constructDefaultRequestSettingsRaw( (int) type, &outMetadata);
		_hidl_cb(status, outMetadata);
		return Void();
		}

		Return<void> CameraDeviceSession::configureStreams_3_4(
		const StreamConfiguration& requestedConfiguration,
		ICameraDeviceSession::configureStreams_3_4_cb _hidl_cb) {

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

+1 −12

Original line number	Diff line number	Diff line
		@@ -133,15 +133,6 @@ Return<void> ExternalCameraDeviceSession::constructDefaultRequestSettings(
		return Void();
		}

		Return<void> ExternalCameraDeviceSession::constructDefaultRequestSettings_3_4(
		RequestTemplate type,
		ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb) {
		V3_2::CameraMetadata outMetadata;
		Status status = constructDefaultRequestSettingsRaw(type, &outMetadata);
		_hidl_cb(status, outMetadata);
		return Void();
		}

		Status ExternalCameraDeviceSession::constructDefaultRequestSettingsRaw(RequestTemplate type,
		V3_2::CameraMetadata *outMetadata) {
		CameraMetadata emptyMd;
		@@ -160,9 +151,7 @@ Status ExternalCameraDeviceSession::constructDefaultRequestSettingsRaw(RequestTe
		}
		case RequestTemplate::MANUAL:
		case RequestTemplate::ZERO_SHUTTER_LAG:
		case RequestTemplate::MOTION_TRACKING_PREVIEW:
		case RequestTemplate::MOTION_TRACKING_BEST:
		// Don't support MANUAL, ZSL, MOTION_TRACKING_* templates
		// Don't support MANUAL, ZSL templates
		status = Status::ILLEGAL_ARGUMENT;
		break;
		default:

camera/device/3.4/default/include/device_v3_4_impl/CameraDeviceSession.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -74,11 +74,6 @@ struct CameraDeviceSession : public V3_3::implementation::CameraDeviceSession {
		protected:
		// Methods from v3.3 and earlier will trampoline to inherited implementation

		// New methods for v3.4
		Return<void> constructDefaultRequestSettings_3_4(
		RequestTemplate type,
		ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb);

		Return<void> configureStreams_3_4(
		const StreamConfiguration& requestedConfiguration,
		ICameraDeviceSession::configureStreams_3_4_cb _hidl_cb);
		@@ -163,12 +158,6 @@ private:
		return mParent->close();
		}

		virtual Return<void> constructDefaultRequestSettings_3_4(
		RequestTemplate type,
		ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb) override {
		return mParent->constructDefaultRequestSettings_3_4(type, _hidl_cb);
		}

		virtual Return<void> configureStreams_3_3(
		const V3_2::StreamConfiguration& requestedConfiguration,
		configureStreams_3_3_cb _hidl_cb) override {

camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h

+3 −13

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ using ::android::hardware::camera::device::V3_2::ErrorCode;
		using ::android::hardware::camera::device::V3_2::ICameraDeviceCallback;
		using ::android::hardware::camera::device::V3_2::MsgType;
		using ::android::hardware::camera::device::V3_2::NotifyMsg;
		using ::android::hardware::camera::device::V3_4::RequestTemplate;
		using ::android::hardware::camera::device::V3_2::RequestTemplate;
		using ::android::hardware::camera::device::V3_2::Stream;
		using ::android::hardware::camera::device::V3_4::StreamConfiguration;
		using ::android::hardware::camera::device::V3_2::StreamConfigurationMode;
		@@ -110,11 +110,7 @@ protected:
		// Methods from ::android::hardware::camera::device::V3_2::ICameraDeviceSession follow

		Return<void> constructDefaultRequestSettings(
		V3_2::RequestTemplate,
		ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb);

		Return<void> constructDefaultRequestSettings_3_4(
		RequestTemplate type,
		RequestTemplate,
		ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb);

		Return<void> configureStreams(
		@@ -341,7 +337,7 @@ private:
		mParent(parent) {}

		virtual Return<void> constructDefaultRequestSettings(
		V3_2::RequestTemplate type,
		RequestTemplate type,
		V3_3::ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb) override {
		return mParent->constructDefaultRequestSettings(type, _hidl_cb);
		}
		@@ -376,12 +372,6 @@ private:
		return mParent->close();
		}

		virtual Return<void> constructDefaultRequestSettings_3_4(
		RequestTemplate type,
		ICameraDeviceSession::constructDefaultRequestSettings_cb _hidl_cb) override {
		return mParent->constructDefaultRequestSettings_3_4(type, _hidl_cb);
		}

		virtual Return<void> configureStreams_3_3(
		const V3_2::StreamConfiguration& requestedConfiguration,
		configureStreams_3_3_cb _hidl_cb) override {