Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4787aa2 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 9d16f3f9: am f72d392f: Merge "Make java constants consistent with native... 

am 9d16f3f9: am f72d392f: Merge "Make java constants consistent with native counterparts." into jb-dev

* commit '9d16f3f9':
  Make java constants consistent with native counterparts.
parents 37fdb849 9d16f3f9

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

























media/java/android/media/MediaCodec.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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);