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

Make java constants consistent with native counterparts.

Browse Source 
Change-Id: I481dfc18c170b4c60682ef1b38b57e10fb73d004
This commit is contained in:
Andreas Huber
2012-05-01 11:50:30 -07:00
parent 7e400cfb71
commit 48dc91b514
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -11013,8 +11013,8 @@ package android.media {
field public static final int INFO_TRY_AGAIN_LATER = -1; // 0xffffffff
field public static final int MODE_AES_CTR = 1; // 0x1
field public static final int MODE_UNENCRYPTED = 0; // 0x0
field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1
field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2
field public static final int VIDEO_SCALING_MODE_STRETCH_TO_FIT = 1; // 0x1
}
public static final class MediaCodec.BufferInfo {

4
media/java/android/media/MediaCodec.java
View File

@@ -443,7 +443,7 @@ final public class MediaCodec {
}
/** The content is scaled to the surface dimensions */
public static final int VIDEO_SCALING_MODE_STRETCH_TO_FIT = 1;
public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1;
/** The content is scaled, maintaining its aspect ratio, the whole
surface area is used, content may be cropped
@@ -451,7 +451,7 @@ final public class MediaCodec {
public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2;
/** If a surface has been specified in a previous call to {@link #configure}
specifies the scaling mode to use. The default is "stretch to fit".
specifies the scaling mode to use. The default is "scale to fit".
*/
public native final void setVideoScalingMode(int mode);