Merge changes from topic "stream_combinations" (c14e1f95) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -16583,6 +16583,7 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> REQUEST_PIPELINE_MAX_DEPTH;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SCALER_CROPPING_TYPE;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_STREAM_COMBINATIONS;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.StreamConfigurationMap> SCALER_STREAM_CONFIGURATION_MAP;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SENSOR_AVAILABLE_TEST_PATTERN_MODES;
		field public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.BlackLevelPattern> SENSOR_BLACK_LEVEL_PATTERN;
		@@ -17153,6 +17154,18 @@ package android.hardware.camera2.params {
		field public static final float MINIMUM_GAIN_FACTOR = 1.0f;
		}

		public final class MandatoryStreamCombination {
		method public java.lang.String getDescription();
		method public java.util.List<android.hardware.camera2.params.MandatoryStreamCombination.MandatoryStreamInformation> getStreamsInformation();
		method public boolean isReprocessable();
		}

		public static final class MandatoryStreamCombination.MandatoryStreamInformation {
		method public java.util.List<android.util.Size> getAvailableSizes();
		method public int getFormat();
		method public boolean isInput();
		}

		public final class MeteringRectangle {
		ctor public MeteringRectangle(int, int, int, int, int);
		ctor public MeteringRectangle(android.graphics.Point, android.util.Size, int);

core/java/android/hardware/camera2/CameraCharacteristics.java

+35 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ import android.hardware.camera2.impl.PublicKey;
		import android.hardware.camera2.impl.SyntheticKey;
		import android.hardware.camera2.params.RecommendedStreamConfigurationMap;
		import android.hardware.camera2.params.SessionConfiguration;
		import android.hardware.camera2.params.MandatoryStreamCombination;
		import android.hardware.camera2.params.MandatoryStreamCombination.MandatoryStreamInformation;
		import android.hardware.camera2.utils.ArrayUtils;
		import android.hardware.camera2.utils.TypeReference;
		import android.util.Rational;
		@@ -2608,6 +2610,39 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<android.hardware.camera2.params.ReprocessFormatsMap> SCALER_AVAILABLE_RECOMMENDED_INPUT_OUTPUT_FORMATS_MAP =
		new Key<android.hardware.camera2.params.ReprocessFormatsMap>("android.scaler.availableRecommendedInputOutputFormatsMap", android.hardware.camera2.params.ReprocessFormatsMap.class);

		/**
		* <p>An array of mandatory stream combinations generated according to the camera device
		* {@link android.hardware.camera2.CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL }
		* and {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES }.
		* This is an app-readable conversion of the mandatory stream combination
		* {@link android.hardware.camera2.CameraDevice#createCaptureSession tables}.</p>
		* <p>The array of
		* {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
		* generated according to the documented
		* {@link android.hardware.camera2.CameraDevice#createCaptureSession guideline} based on
		* specific device level and capabilities.
		* Clients can use the array as a quick reference to find an appropriate camera stream
		* combination.
		* As per documentation, the stream combinations with given PREVIEW, RECORD and
		* MAXIMUM resolutions and anything smaller from the list given by
		* {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputSizes } are
		* guaranteed to work.
		* The mandatory stream combination array will be {@code null} in case the device is a
		* physical camera not independently exposed in
		* {@link android.hardware.camera2.CameraManager#getCameraIdList } or is not backward
		* compatible.</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		*/
		@PublicKey
		@SyntheticKey
		public static final Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_STREAM_COMBINATIONS =
		new Key<android.hardware.camera2.params.MandatoryStreamCombination[]>("android.scaler.mandatoryStreamCombinations", android.hardware.camera2.params.MandatoryStreamCombination[].class);

		/**
		* <p>The area of the image sensor which corresponds to active pixels after any geometric
		* distortion correction has been applied.</p>

core/java/android/hardware/camera2/CameraDevice.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -435,9 +435,13 @@ public abstract class CameraDevice implements AutoCloseable {
		* </table><br>
		* </p>
		*
		* <p>Clients can access the above mandatory stream combination tables via
		* {@link android.hardware.camera2.params.MandatoryStreamCombination}.</p>
		*
		* <p>Since the capabilities of camera devices vary greatly, a given camera device may support
		* target combinations with sizes outside of these guarantees, but this can only be tested for
		* by attempting to create a session with such targets.</p>
		* by calling {@link #isSessionConfigurationSupported} or attempting to create a session with
		* such targets.</p>
		*
		* @param outputs The new set of Surfaces that should be made available as
		* targets for captured image data.
		@@ -619,6 +623,9 @@ public abstract class CameraDevice implements AutoCloseable {
		* </table><br>
		* </p>
		*
		* <p>Clients can access the above mandatory stream combination tables via
		* {@link android.hardware.camera2.params.MandatoryStreamCombination}.</p>
		*
		* @param inputConfig The configuration for the input {@link Surface}
		* @param outputs The new set of Surfaces that should be made available as
		* targets for captured image data.
		@@ -980,6 +987,12 @@ public abstract class CameraDevice implements AutoCloseable {
		* It must not impact normal camera behavior in any way and must complete significantly
		* faster than creating a regular or constrained capture session.</p>
		*
		* <p>Although this method is faster than creating a new capture session, it is not intended
		* to be used for exploring the entire space of supported stream combinations. The available
		* mandatory stream combinations
		* {@link android.hardware.camera2.params.MandatoryStreamCombination} are better suited for this
		* purpose.</p>
		*
		* <p>Note that session parameters will be ignored and calls to
		* {@link SessionConfiguration#setSessionParameters} are not required.</p>
		*

core/java/android/hardware/camera2/CameraManager.java

+41 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@ import android.os.ServiceSpecificException;
		import android.os.SystemProperties;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Size;
		import android.view.Display;
		import android.view.WindowManager;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -231,6 +234,30 @@ public final class CameraManager {
		CameraManagerGlobal.get().unregisterTorchCallback(callback);
		}

		private Size getDisplaySize() {
		Size ret = new Size(0, 0);

		try {
		WindowManager windowManager =
		(WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
		Display display = windowManager.getDefaultDisplay();

		int width = display.getWidth();
		int height = display.getHeight();

		if (height > width) {
		height = width;
		width = display.getHeight();
		}

		ret = new Size(width, height);
		} catch (Exception e) {
		Log.e(TAG, "getDisplaySize Failed. " + e.toString());
		}

		return ret;
		}

		/**
		* <p>Query the capabilities of a camera device. These capabilities are
		* immutable for a given camera.</p>
		@@ -269,6 +296,8 @@ public final class CameraManager {
		"Camera service is currently unavailable");
		}
		try {
		Size displaySize = getDisplaySize();

		// First check isHiddenPhysicalCamera to avoid supportsCamera2ApiLocked throwing
		// exception in case cameraId is a hidden physical camera.
		if (!isHiddenPhysicalCamera(cameraId) && !supportsCamera2ApiLocked(cameraId)) {
		@@ -280,10 +309,19 @@ public final class CameraManager {

		CameraInfo info = cameraService.getCameraInfo(id);

		characteristics = LegacyMetadataMapper.createCharacteristics(parameters, info);
		characteristics = LegacyMetadataMapper.createCharacteristics(parameters, info,
		id, displaySize);
		} else {
		// Normal path: Get the camera characteristics directly from the camera service
		CameraMetadataNative info = cameraService.getCameraCharacteristics(cameraId);
		if (!isHiddenPhysicalCamera(cameraId)) {
		try {
		info.setCameraId(Integer.parseInt(cameraId));
		} catch (NumberFormatException e) {
		Log.e(TAG, "Failed to parse camera Id " + cameraId + " to integer");
		}
		}
		info.setDisplaySize(displaySize);

		characteristics = new CameraCharacteristics(info);
		}
		@@ -363,7 +401,8 @@ public final class CameraManager {
		}

		Log.i(TAG, "Using legacy camera HAL.");
		cameraUser = CameraDeviceUserShim.connectBinderShim(callbacks, id);
		cameraUser = CameraDeviceUserShim.connectBinderShim(callbacks, id,
		getDisplaySize());
		}
		} catch (ServiceSpecificException e) {
		if (e.errorCode == ICameraService.ERROR_DEPRECATED_HAL) {

core/java/android/hardware/camera2/impl/CameraMetadataNative.java

+59 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@ import android.hardware.camera2.marshal.impl.MarshalQueryableString;
		import android.hardware.camera2.params.Face;
		import android.hardware.camera2.params.HighSpeedVideoConfiguration;
		import android.hardware.camera2.params.LensShadingMap;
		import android.hardware.camera2.params.MandatoryStreamCombination;
		import android.hardware.camera2.params.MandatoryStreamCombination.MandatoryStreamInformation;
		import android.hardware.camera2.params.OisSample;
		import android.hardware.camera2.params.RecommendedStreamConfiguration;
		import android.hardware.camera2.params.RecommendedStreamConfigurationMap;
		@@ -75,6 +77,7 @@ import java.nio.ByteBuffer;
		import java.nio.ByteOrder;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;

		/**
		* Implementation of camera metadata marshal/unmarshal across Binder to
		@@ -576,6 +579,15 @@ public class CameraMetadataNative implements Parcelable {
		return (T) metadata.getStreamConfigurationMap();
		}
		});
		sGetCommandMap.put(
		CameraCharacteristics.SCALER_MANDATORY_STREAM_COMBINATIONS.getNativeKey(),
		new GetCommand() {
		@Override
		@SuppressWarnings("unchecked")
		public <T> T getValue(CameraMetadataNative metadata, Key<T> key) {
		return (T) metadata.getMandatoryStreamCombinations();
		}
		});
		sGetCommandMap.put(
		CameraCharacteristics.CONTROL_MAX_REGIONS_AE.getNativeKey(), new GetCommand() {
		@Override
		@@ -1161,6 +1173,26 @@ public class CameraMetadataNative implements Parcelable {
		return ret;
		}

		private MandatoryStreamCombination[] getMandatoryStreamCombinations() {
		int[] capabilities = getBase(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
		ArrayList<Integer> caps = new ArrayList<Integer>();
		caps.ensureCapacity(capabilities.length);
		for (int c : capabilities) {
		caps.add(new Integer(c));
		}
		int hwLevel = getBase(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
		MandatoryStreamCombination.Builder build = new MandatoryStreamCombination.Builder(
		mCameraId, hwLevel, mDisplaySize, caps, getStreamConfigurationMap());
		List<MandatoryStreamCombination> combs = build.getAvailableMandatoryStreamCombinations();
		if ((combs != null) && (!combs.isEmpty())) {
		MandatoryStreamCombination[] combArray = new MandatoryStreamCombination[combs.size()];
		combArray = combs.toArray(combArray);
		return combArray;
		}

		return null;
		}

		private StreamConfigurationMap getStreamConfigurationMap() {
		StreamConfiguration[] configurations = getBase(
		CameraCharacteristics.SCALER_AVAILABLE_STREAM_CONFIGURATIONS);
		@@ -1433,6 +1465,31 @@ public class CameraMetadataNative implements Parcelable {
		return true;
		}

		private int mCameraId = -1;
		private Size mDisplaySize = new Size(0, 0);

		/**
		* Set the current camera Id.
		*
		* @param cameraId Current camera id.
		*
		* @hide
		*/
		public void setCameraId(int cameraId) {
		mCameraId = cameraId;
		}

		/**
		* Set the current display size.
		*
		* @param displaySize The current display size.
		*
		* @hide
		*/
		public void setDisplaySize(Size displaySize) {
		mDisplaySize = displaySize;
		}

		@UnsupportedAppUsage
		private long mMetadataPtr; // native CameraMetadata*

		@@ -1476,6 +1533,8 @@ public class CameraMetadataNative implements Parcelable {
		*/
		public void swap(CameraMetadataNative other) {
		nativeSwap(other);
		mCameraId = other.mCameraId;
		mDisplaySize = other.mDisplaySize;
		}

		/**