Camera: Add physicalCameraId to OutputConfiguration (c28189a6) · Commits · e / os / android_frameworks_av

camera/camera2/OutputConfiguration.cpp

+13 −3

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2015, The Android Open Source Project
		** Copyright 2015-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.
		@@ -64,6 +64,10 @@ bool OutputConfiguration::isShared() const {
		return mIsShared;
		}

		String16 OutputConfiguration::getPhysicalCameraId() const {
		return mPhysicalCameraId;
		}

		OutputConfiguration::OutputConfiguration() :
		mRotation(INVALID_ROTATION),
		mSurfaceSetID(INVALID_SET_ID),
		@@ -139,6 +143,8 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) {
		return err;
		}

		parcel->readString16(&mPhysicalCameraId);

		mRotation = rotation;
		mSurfaceSetID = setID;
		mSurfaceType = surfaceType;
		@@ -153,8 +159,9 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) {
		mGbps.push_back(surface.graphicBufferProducer);
		}

		ALOGV("%s: OutputConfiguration: rotation = %d, setId = %d, surfaceType = %d",
		__FUNCTION__, mRotation, mSurfaceSetID, mSurfaceType);
		ALOGV("%s: OutputConfiguration: rotation = %d, setId = %d, surfaceType = %d,"
		" physicalCameraId = %s", __FUNCTION__, mRotation, mSurfaceSetID,
		mSurfaceType, String8(mPhysicalCameraId).string());

		return err;
		}
		@@ -204,6 +211,9 @@ status_t OutputConfiguration::writeToParcel(android::Parcel* parcel) const {
		err = parcel->writeParcelableVector(surfaceShims);
		if (err != OK) return err;

		err = parcel->writeString16(mPhysicalCameraId);
		if (err != OK) return err;

		return OK;
		}

camera/include/camera/camera2/OutputConfiguration.h

+8 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		* Copyright (C) 2015-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.
		@@ -46,6 +46,7 @@ public:
		int getHeight() const;
		bool isDeferred() const;
		bool isShared() const;
		String16 getPhysicalCameraId() const;
		/**
		* Keep impl up-to-date with OutputConfiguration.java in frameworks/base
		*/
		@@ -74,7 +75,8 @@ public:
		mHeight == other.mHeight &&
		mIsDeferred == other.mIsDeferred &&
		mIsShared == other.mIsShared &&
		gbpsEqual(other));
		gbpsEqual(other) &&
		mPhysicalCameraId == other.mPhysicalCameraId );
		}
		bool operator != (const OutputConfiguration& other) const {
		return !(*this == other);
		@@ -102,6 +104,9 @@ public:
		if (mIsShared != other.mIsShared) {
		return mIsShared < other.mIsShared;
		}
		if (mPhysicalCameraId != other.mPhysicalCameraId) {
		return mPhysicalCameraId < other.mPhysicalCameraId;
		}
		return gbpsLessThan(other);
		}
		bool operator > (const OutputConfiguration& other) const {
		@@ -120,8 +125,7 @@ private:
		int mHeight;
		bool mIsDeferred;
		bool mIsShared;
		// helper function
		static String16 readMaybeEmptyString16(const android::Parcel* parcel);
		String16 mPhysicalCameraId;
		};
		} // namespace params
		} // namespace camera2

camera/ndk/include/camera/NdkCameraMetadataTags.h

+92 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ typedef enum acamera_metadata_section {
		ACAMERA_SYNC,
		ACAMERA_REPROCESS,
		ACAMERA_DEPTH,
		ACAMERA_LOGICAL_MULTI_CAMERA,
		ACAMERA_SECTION_COUNT,

		ACAMERA_VENDOR = 0x8000
		@@ -104,6 +105,9 @@ typedef enum acamera_metadata_section_start {
		ACAMERA_SYNC_START = ACAMERA_SYNC << 16,
		ACAMERA_REPROCESS_START = ACAMERA_REPROCESS << 16,
		ACAMERA_DEPTH_START = ACAMERA_DEPTH << 16,
		ACAMERA_LOGICAL_MULTI_CAMERA_START
		= ACAMERA_LOGICAL_MULTI_CAMERA
		<< 16,
		ACAMERA_VENDOR_START = ACAMERA_VENDOR << 16
		} acamera_metadata_section_start_t;

		@@ -5165,6 +5169,29 @@ typedef enum acamera_metadata_tag {
		ACAMERA_DEPTH_START + 4,
		ACAMERA_DEPTH_END,

		/**
		* <p>The accuracy of frame timestamp synchronization between physical cameras</p>
		*
		* <p>Type: byte (acamera_metadata_enum_android_logical_multi_camera_sensor_sync_type_t)</p>
		*
		* <p>This tag may appear in:
		* <ul>
		* <li>ACameraMetadata from ACameraManager_getCameraCharacteristics</li>
		* </ul></p>
		*
		* <p>The accuracy of the frame timestamp synchronization determines the physical cameras'
		* ability to start exposure at the same time. If the sensorSyncType is CALIBRATED,
		* the physical camera sensors usually run in master-slave mode so that their shutter
		* time is synchronized. For APPROXIMATE sensorSyncType, the camera sensors usually run in
		* master-master mode, and there could be offset between their start of exposure.</p>
		* <p>In both cases, all images generated for a particular capture request still carry the same
		* timestamps, so that they can be used to look up the matching frame number and
		* onCaptureStarted callback.</p>
		*/
		ACAMERA_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE = // byte (acamera_metadata_enum_android_logical_multi_camera_sensor_sync_type_t)
		ACAMERA_LOGICAL_MULTI_CAMERA_START + 1,
		ACAMERA_LOGICAL_MULTI_CAMERA_END,

		} acamera_metadata_tag_t;

		/**
		@@ -6895,6 +6922,52 @@ typedef enum acamera_metadata_enum_acamera_request_available_capabilities {
		*/
		ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING = 10,

		/**
		* <p>The camera device is a logical camera backed by two or more physical cameras that are
		* also exposed to the application.</p>
		* <p>This capability requires the camera device to support the following:</p>
		* <ul>
		* <li>This camera device must list the following static metadata entries in <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html">CameraCharacteristics</a>:<ul>
		* <li>android.logicalMultiCamera.physicalIds</li>
		* <li>ACAMERA_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE</li>
		* </ul>
		* </li>
		* <li>The underlying physical cameras' static metadata must list the following entries,
		* so that the application can correlate pixels from the physical streams:<ul>
		* <li>ACAMERA_LENS_POSE_REFERENCE</li>
		* <li>ACAMERA_LENS_POSE_ROTATION</li>
		* <li>ACAMERA_LENS_POSE_TRANSLATION</li>
		* <li>ACAMERA_LENS_INTRINSIC_CALIBRATION</li>
		* <li>ACAMERA_LENS_RADIAL_DISTORTION</li>
		* </ul>
		* </li>
		* <li>The logical camera device must be LIMITED or higher device.</li>
		* </ul>
		* <p>Both the logical camera device and its underlying physical devices support the
		* mandatory stream combinations required for their device levels.</p>
		* <p>Additionally, for each guaranteed stream combination, the logical camera supports:</p>
		* <ul>
		* <li>Replacing one logical {@link AIMAGE_FORMAT_YUV_420_888 YUV_420_888}
		* or raw stream with two physical streams of the same size and format, each from a
		* separate physical camera, given that the size and format are supported by both
		* physical cameras.</li>
		* <li>Adding two raw streams, each from one physical camera, if the logical camera doesn't
		* advertise RAW capability, but the underlying physical cameras do. This is usually
		* the case when the physical cameras have different sensor sizes.</li>
		* </ul>
		* <p>Using physical streams in place of a logical stream of the same size and format will
		* not slow down the frame rate of the capture, as long as the minimum frame duration
		* of the physical and logical streams are the same.</p>
		*
		* @see ACAMERA_LENS_INTRINSIC_CALIBRATION
		* @see ACAMERA_LENS_POSE_REFERENCE
		* @see ACAMERA_LENS_POSE_ROTATION
		* @see ACAMERA_LENS_POSE_TRANSLATION
		* @see ACAMERA_LENS_RADIAL_DISTORTION
		* @see ACAMERA_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE
		*/
		ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA = 11,

		} acamera_metadata_enum_android_request_available_capabilities_t;


		@@ -7474,6 +7547,25 @@ typedef enum acamera_metadata_enum_acamera_depth_depth_is_exclusive {
		} acamera_metadata_enum_android_depth_depth_is_exclusive_t;


		// ACAMERA_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE
		typedef enum acamera_metadata_enum_acamera_logical_multi_camera_sensor_sync_type {
		/**
		* <p>A software mechanism is used to synchronize between the physical cameras. As a result,
		* the timestamp of an image from a physical stream is only an approximation of the
		* image sensor start-of-exposure time.</p>
		*/
		ACAMERA_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE_APPROXIMATE = 0,

		/**
		* <p>The camera device supports frame timestamp synchronization at the hardware level,
		* and the timestamp of a physical stream image accurately reflects its
		* start-of-exposure time.</p>
		*/
		ACAMERA_LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE_CALIBRATED = 1,

		} acamera_metadata_enum_android_logical_multi_camera_sensor_sync_type_t;


		#endif /* __ANDROID_API__ >= 24 */

		__END_DECLS

services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp

+3 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		* Copyright (C) 2012-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.
		@@ -154,7 +154,8 @@ status_t CallbackProcessor::updateStream(const Parameters &params) {
		callbackFormat, params.previewFormat);
		res = device->createStream(mCallbackWindow,
		params.previewWidth, params.previewHeight, callbackFormat,
		HAL_DATASPACE_V0_JFIF, CAMERA3_STREAM_ROTATION_0, &mCallbackStreamId);
		HAL_DATASPACE_V0_JFIF, CAMERA3_STREAM_ROTATION_0, &mCallbackStreamId,
		String8());
		if (res != OK) {
		ALOGE("%s: Camera %d: Can't create output stream for callbacks: "
		"%s (%d)", __FUNCTION__, mId,

services/camera/libcameraservice/api1/client2/JpegProcessor.cpp

+3 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		* Copyright (C) 2012-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.
		@@ -168,7 +168,8 @@ status_t JpegProcessor::updateStream(const Parameters &params) {
		res = device->createStream(mCaptureWindow,
		params.pictureWidth, params.pictureHeight,
		HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_V0_JFIF,
		CAMERA3_STREAM_ROTATION_0, &mCaptureStreamId);
		CAMERA3_STREAM_ROTATION_0, &mCaptureStreamId,
		String8());
		if (res != OK) {
		ALOGE("%s: Camera %d: Can't create output stream for capture: "
		"%s (%d)", __FUNCTION__, mId,