diff options
| author | 2012-05-01 13:32:18 -0700 | |
|---|---|---|
| committer | 2012-05-01 13:32:18 -0700 | |
| commit | f72d392f5deeda68af6a8a9b4a8c62f215331129 (patch) | |
| tree | 58515de52727294f053af26ba4fda6254d567da2 | |
| parent | 37a8370b6279c5359f6d32b5abb3c3fd37e826b3 (diff) | |
| parent | 48dc91b514844b04f1d8dec18a480f9591a2f989 (diff) | |
Merge "Make java constants consistent with native counterparts." into jb-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index cc5ae4bd7deb..9fa2cf89e870 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11019,8 +11019,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 { diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index ab8f88439964..bbdbf2e19922 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -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); |