Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding video width/height to camera capabilities.

Browse Source 
Bug: 16602621
Bug: 16573836
Change-Id: Idaca4b6d889bf7910fcc37bee7ef478e2fbe3af3
This commit is contained in:
Tyler Gunn
2014-07-27 14:51:29 -07:00
parent 8a850b4c0e
commit 5d231e1343
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -28594,9 +28594,11 @@ package android.telecomm {
}
public final class CallCameraCapabilities implements android.os.Parcelable {
ctor public CallCameraCapabilities(boolean, float);
ctor public CallCameraCapabilities(boolean, float, int, int);
method public int describeContents();
method public int getHeight();
method public float getMaxZoom();
method public int getWidth();
method public boolean isZoomSupported();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;

37
telecomm/java/android/telecomm/CallCameraCapabilities.java
View File

@@ -35,15 +35,29 @@ public final class CallCameraCapabilities implements Parcelable {
*/
private final float mMaxZoom;
/**
* The width of the camera video in pixels.
*/
private final int mWidth;
/**
* The height of the camera video in pixels.
*/
private final int mHeight;
/**
* Create a call camera capabilities instance.
*
* @param zoomSupported True when camera supports zoom.
* @param maxZoom Maximum zoom supported by camera.
* @param width The width of the camera video (in pixels).
* @param height The height of the camera video (in pixels).
*/
public CallCameraCapabilities(boolean zoomSupported, float maxZoom) {
public CallCameraCapabilities(boolean zoomSupported, float maxZoom, int width, int height) {
mZoomSupported = zoomSupported;
mMaxZoom = maxZoom;
mWidth = width;
mHeight = height;
}
/**
@@ -61,8 +75,10 @@ public final class CallCameraCapabilities implements Parcelable {
public CallCameraCapabilities createFromParcel(Parcel source) {
boolean supportsZoom = source.readByte() != 0;
float maxZoom = source.readFloat();
int width = source.readInt();
int height = source.readInt();
return new CallCameraCapabilities(supportsZoom, maxZoom);
return new CallCameraCapabilities(supportsZoom, maxZoom, width, height);
}
@Override
@@ -94,7 +110,8 @@ public final class CallCameraCapabilities implements Parcelable {
public void writeToParcel(Parcel dest, int flags) {
dest.writeByte((byte) (isZoomSupported() ? 1 : 0));
dest.writeFloat(getMaxZoom());
dest.writeInt(getWidth());
dest.writeInt(getHeight());
}
/**
@@ -110,4 +127,18 @@ public final class CallCameraCapabilities implements Parcelable {
public float getMaxZoom() {
return mMaxZoom;
}
/**
* The width of the camera video in pixels.
*/
public int getWidth() {
return mWidth;
}
/**
* The height of the camera video in pixels.
*/
public int getHeight() {
return mHeight;
}
}