Merge "camera2: Move parameters around to different packages" (9d08a93b) · Commits · e / os / android_frameworks_base

api/current.txt

+26 −32

Original line number	Diff line number	Diff line
		@@ -12308,12 +12308,16 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_MODE;
		}

		}

		package android.hardware.camera2.params {

		public final class ColorSpaceTransform {
		ctor public ColorSpaceTransform(android.hardware.camera2.Rational[]);
		ctor public ColorSpaceTransform(android.util.Rational[]);
		ctor public ColorSpaceTransform(int[]);
		method public void copyElements(android.hardware.camera2.Rational[], int);
		method public void copyElements(android.util.Rational[], int);
		method public void copyElements(int[], int);
		method public android.hardware.camera2.Rational getElement(int, int);
		method public android.util.Rational getElement(int, int);
		}

		public final class Face {
		@@ -12333,7 +12337,7 @@ package android.hardware.camera2 {
		method public int getColumnCount();
		method public float getGainFactor(int, int, int);
		method public int getGainFactorCount();
		method public android.hardware.camera2.RggbChannelVector getGainFactorVector(int, int);
		method public android.hardware.camera2.params.RggbChannelVector getGainFactorVector(int, int);
		method public int getRowCount();
		field public static final float MINIMUM_GAIN_FACTOR = 1.0f;
		}
		@@ -12342,7 +12346,7 @@ package android.hardware.camera2 {
		ctor public MeteringRectangle(int, int, int, int, int);
		ctor public MeteringRectangle(android.graphics.Point, android.util.Size, int);
		ctor public MeteringRectangle(android.graphics.Rect, int);
		method public boolean equals(android.hardware.camera2.MeteringRectangle);
		method public boolean equals(android.hardware.camera2.params.MeteringRectangle);
		method public int getHeight();
		method public int getMeteringWeight();
		method public android.graphics.Rect getRect();
		@@ -12353,12 +12357,6 @@ package android.hardware.camera2 {
		method public int getY();
		}

		public final class Rational {
		ctor public Rational(int, int);
		method public int getDenominator();
		method public int getNumerator();
		}

		public final class RggbChannelVector {
		ctor public RggbChannelVector(float, float, float, float);
		method public void copyTo(float[], int);
		@@ -12374,10 +12372,17 @@ package android.hardware.camera2 {
		field public static final int RED = 0; // 0x0
		}

		public final class Size {
		ctor public Size(int, int);
		method public final int getHeight();
		method public final int getWidth();
		public final class StreamConfigurationMap {
		method public final int[] getOutputFormats();
		method public long getOutputMinFrameDuration(int, android.util.Size);
		method public long getOutputMinFrameDuration(java.lang.Class<T>, android.util.Size);
		method public android.util.Size[] getOutputSizes(java.lang.Class<T>);
		method public android.util.Size[] getOutputSizes(int);
		method public long getOutputStallDuration(int, android.util.Size);
		method public long getOutputStallDuration(java.lang.Class<T>, android.util.Size);
		method public boolean isOutputSupportedFor(int);
		method public static boolean isOutputSupportedFor(java.lang.Class<T>);
		method public boolean isOutputSupportedFor(android.view.Surface);
		}

		public final class TonemapCurve {
		@@ -12394,23 +12399,6 @@ package android.hardware.camera2 {

		}

		package android.hardware.camera2.params {

		public final class StreamConfigurationMap {
		method public final int[] getOutputFormats();
		method public long getOutputMinFrameDuration(int, android.util.Size);
		method public long getOutputMinFrameDuration(java.lang.Class<T>, android.util.Size);
		method public android.util.Size[] getOutputSizes(java.lang.Class<T>);
		method public android.util.Size[] getOutputSizes(int);
		method public long getOutputStallDuration(int, android.util.Size);
		method public long getOutputStallDuration(java.lang.Class<T>, android.util.Size);
		method public boolean isOutputSupportedFor(int);
		method public static boolean isOutputSupportedFor(java.lang.Class<T>);
		method public boolean isOutputSupportedFor(android.view.Surface);
		}

		}

		package android.hardware.display {

		public final class DisplayManager {
		@@ -29996,6 +29984,12 @@ package android.util {
		method public T getUpper();
		}

		public final class Rational {
		ctor public Rational(int, int);
		method public int getDenominator();
		method public int getNumerator();
		}

		public final class Size {
		ctor public Size(int, int);
		method public int getHeight();

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

+11 −22

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.hardware.camera2;

		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.util.Rational;

		import java.util.Collections;
		import java.util.List;
		@@ -316,8 +317,8 @@ public final class CameraCharacteristics extends CameraMetadata {
		* <li>All non (0, 0) sizes will have non-zero widths and heights.</li>
		* </ul>
		*/
		public static final Key<android.hardware.camera2.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES =
		new Key<android.hardware.camera2.Size[]>("android.jpeg.availableThumbnailSizes", android.hardware.camera2.Size[].class);
		public static final Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES =
		new Key<android.util.Size[]>("android.jpeg.availableThumbnailSizes", android.util.Size[].class);

		/**
		* <p>List of supported aperture
		@@ -393,8 +394,8 @@ public final class CameraCharacteristics extends CameraMetadata {
		* <p>The map should be on the order of 30-40 rows and columns, and
		* must be smaller than 64x64.</p>
		*/
		public static final Key<android.hardware.camera2.Size> LENS_INFO_SHADING_MAP_SIZE =
		new Key<android.hardware.camera2.Size>("android.lens.info.shadingMapSize", android.hardware.camera2.Size.class);
		public static final Key<android.util.Size> LENS_INFO_SHADING_MAP_SIZE =
		new Key<android.util.Size>("android.lens.info.shadingMapSize", android.util.Size.class);

		/**
		* <p>The lens focus distance calibration quality.</p>
		@@ -658,8 +659,8 @@ public final class CameraCharacteristics extends CameraMetadata {
		* @hide
		*/
		@Deprecated
		public static final Key<android.hardware.camera2.Size[]> SCALER_AVAILABLE_JPEG_SIZES =
		new Key<android.hardware.camera2.Size[]>("android.scaler.availableJpegSizes", android.hardware.camera2.Size[].class);
		public static final Key<android.util.Size[]> SCALER_AVAILABLE_JPEG_SIZES =
		new Key<android.util.Size[]>("android.scaler.availableJpegSizes", android.util.Size[].class);

		/**
		* <p>The maximum ratio between active area width
		@@ -704,8 +705,8 @@ public final class CameraCharacteristics extends CameraMetadata {
		* @hide
		*/
		@Deprecated
		public static final Key<android.hardware.camera2.Size[]> SCALER_AVAILABLE_PROCESSED_SIZES =
		new Key<android.hardware.camera2.Size[]>("android.scaler.availableProcessedSizes", android.hardware.camera2.Size[].class);
		public static final Key<android.util.Size[]> SCALER_AVAILABLE_PROCESSED_SIZES =
		new Key<android.util.Size[]>("android.scaler.availableProcessedSizes", android.util.Size[].class);

		/**
		* <p>The mapping of image formats that are supported by this
		@@ -961,9 +962,6 @@ public final class CameraCharacteristics extends CameraMetadata {
		* can provide.</p>
		* <p>Please reference the documentation for the image data destination to
		* check if it limits the maximum size for image data.</p>
		* <p>Not all output formats may be supported in a configuration with
		* an input stream of a particular format. For more details, see
		* android.scaler.availableInputOutputFormatsMap.</p>
		* <p>The following table describes the minimum required output stream
		* configurations based on the hardware level
		* ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel}):</p>
		@@ -1106,8 +1104,8 @@ public final class CameraCharacteristics extends CameraMetadata {
		* match this in
		* android.scaler.availableStreamConfigurations.</p>
		*/
		public static final Key<android.hardware.camera2.Size> SENSOR_INFO_PIXEL_ARRAY_SIZE =
		new Key<android.hardware.camera2.Size>("android.sensor.info.pixelArraySize", android.hardware.camera2.Size.class);
		public static final Key<android.util.Size> SENSOR_INFO_PIXEL_ARRAY_SIZE =
		new Key<android.util.Size>("android.sensor.info.pixelArraySize", android.util.Size.class);

		/**
		* <p>Maximum raw value output by sensor.</p>
		@@ -1515,13 +1513,4 @@ public final class CameraCharacteristics extends CameraMetadata {
		/*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
		* End generated code
		~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@/









		}

core/java/android/hardware/camera2/CaptureRequest.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.hardware.camera2;
		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Rational;
		import android.view.Surface;

		import java.util.HashSet;
		@@ -169,7 +170,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		* @param in The parcel from which the object should be read
		* @hide
		*/
		public void readFromParcel(Parcel in) {
		private void readFromParcel(Parcel in) {
		mSettings.readFromParcel(in);

		mSurfaceSet.clear();
		@@ -965,8 +966,8 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		* <p>When a jpeg image capture is issued, the thumbnail size selected should have
		* the same aspect ratio as the jpeg image.</p>
		*/
		public static final Key<android.hardware.camera2.Size> JPEG_THUMBNAIL_SIZE =
		new Key<android.hardware.camera2.Size>("android.jpeg.thumbnailSize", android.hardware.camera2.Size.class);
		public static final Key<android.util.Size> JPEG_THUMBNAIL_SIZE =
		new Key<android.util.Size>("android.jpeg.thumbnailSize", android.util.Size.class);

		/**
		* <p>The ratio of lens focal length to the effective
		@@ -1518,12 +1519,4 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		/*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
		* End generated code
		~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@/








		}

core/java/android/hardware/camera2/CaptureResult.java

+14 −25

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.hardware.camera2;

		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.camera2.params.Face;
		import android.util.Rational;

		/**
		* <p>The results of a single image capture from the image sensor.</p>
		@@ -1512,8 +1514,8 @@ public final class CaptureResult extends CameraMetadata {
		* <p>When a jpeg image capture is issued, the thumbnail size selected should have
		* the same aspect ratio as the jpeg image.</p>
		*/
		public static final Key<android.hardware.camera2.Size> JPEG_THUMBNAIL_SIZE =
		new Key<android.hardware.camera2.Size>("android.jpeg.thumbnailSize", android.hardware.camera2.Size.class);
		public static final Key<android.util.Size> JPEG_THUMBNAIL_SIZE =
		new Key<android.util.Size>("android.jpeg.thumbnailSize", android.util.Size.class);

		/**
		* <p>The ratio of lens focal length to the effective
		@@ -2059,6 +2061,16 @@ public final class CaptureResult extends CameraMetadata {
		public static final Key<byte[]> STATISTICS_FACE_SCORES =
		new Key<byte[]>("android.statistics.faceScores", byte[].class);

		/**
		* <p>List of the faces detected through camera face detection
		* in this result.</p>
		* <p>Only available if {@link CaptureRequest#STATISTICS_FACE_DETECT_MODE android.statistics.faceDetectMode} <code>!=</code> OFF.</p>
		*
		* @see CaptureRequest#STATISTICS_FACE_DETECT_MODE
		*/
		public static final Key<android.hardware.camera2.params.Face[]> STATISTICS_FACES =
		new Key<android.hardware.camera2.params.Face[]>("android.statistics.faces", android.hardware.camera2.params.Face[].class);

		/**
		* <p>The shading map is a low-resolution floating-point map
		* that lists the coefficients used to correct for vignetting, for each
		@@ -2425,27 +2437,4 @@ public final class CaptureResult extends CameraMetadata {
		/*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~
		* End generated code
		~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@/









		/**
		* <p>
		* List of the {@link Face Faces} detected through camera face detection
		* in this result.
		* </p>
		* <p>
		* Only available if {@link #STATISTICS_FACE_DETECT_MODE} {@code !=}
		* {@link CameraMetadata#STATISTICS_FACE_DETECT_MODE_OFF OFF}.
		* </p>
		*
		* @see Face
		*/
		public static final Key<Face[]> STATISTICS_FACES =
		new Key<Face[]>("android.statistics.faces", Face[].class);
		}

core/java/android/hardware/camera2/ICameraDeviceCallbacks.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		package android.hardware.camera2;

		import android.hardware.camera2.impl.CameraMetadataNative;
		import android.hardware.camera2.CaptureResultExtras;
		import android.hardware.camera2.impl.CaptureResultExtras;

		/** @hide */
		interface ICameraDeviceCallbacks