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

Commit 34f17dd1 authored by Andy McFadden's avatar Andy McFadden
Browse files

Publish new MediaCodec API 

Un-hide two new methods in MediaCodec, one new constant, and a new
EGL extension.

Bug 7991062
Bug 8191230

Change-Id: I028669132d9ffda1e4b34a561bab3997bbd7dae5
parent 098b3ba5

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -11265,6 +11265,7 @@ package android.media { 
    method public static android.media.MediaCodec createByCodecName(java.lang.String);

    method public static android.media.MediaCodec createDecoderByType(java.lang.String);

    method public static android.media.MediaCodec createEncoderByType(java.lang.String);

    method public final android.view.Surface createInputSurface();

    method public final int dequeueInputBuffer(long);

    method public final int dequeueOutputBuffer(android.media.MediaCodec.BufferInfo, long);

    method public final void flush();
@@ -11278,6 +11279,7 @@ package android.media { 
    method public final void release();

    method public final void releaseOutputBuffer(int, boolean);

    method public final void setVideoScalingMode(int);

    method public final void signalEndOfInputStream();

    method public final void start();

    method public final void stop();

    field public static final int BUFFER_FLAG_CODEC_CONFIG = 2; // 0x2
@@ -11357,6 +11359,7 @@ package android.media { 
    field public static final int COLOR_FormatRawBayer10bit = 31; // 0x1f

    field public static final int COLOR_FormatRawBayer8bit = 30; // 0x1e

    field public static final int COLOR_FormatRawBayer8bitcompressed = 32; // 0x20

    field public static final int COLOR_FormatSurface = 2130708361; // 0x7f000789

    field public static final int COLOR_FormatYCbYCr = 25; // 0x19

    field public static final int COLOR_FormatYCrYCb = 26; // 0x1a

    field public static final int COLOR_FormatYUV411PackedPlanar = 18; // 0x12
@@ -14111,6 +14114,7 @@ package android.opengl { 
    method public static int eglGetError();

    method public static boolean eglInitialize(android.opengl.EGLDisplay, int[], int, int[], int);

    method public static boolean eglMakeCurrent(android.opengl.EGLDisplay, android.opengl.EGLSurface, android.opengl.EGLSurface, android.opengl.EGLContext);

    method public static boolean eglPresentationTimeANDROID(android.opengl.EGLDisplay, android.opengl.EGLSurface, long);

    method public static int eglQueryAPI();

    method public static boolean eglQueryContext(android.opengl.EGLDisplay, android.opengl.EGLContext, int, int[], int);

    method public static java.lang.String eglQueryString(android.opengl.EGLDisplay, int);

media/java/android/media/MediaCodec.java

+0 −2
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ final public class MediaCodec { 
     * <p>

     * The application is responsible for calling release() on the Surface when

     * done.

     * @hide -- TODO(fadden): make this public before release

     */

    public native final Surface createInputSurface();
@@ -471,7 +470,6 @@ final public class MediaCodec { 
     * Signals end-of-stream on input.  Equivalent to submitting an empty buffer with

     * {@link #BUFFER_FLAG_END_OF_STREAM} set.  This may only be used with

     * encoders receiving input from a Surface created by {@link #createInputSurface}.

     * @hide -- TODO(fadden): make this public before release

     */

    public native final void signalEndOfInputStream();

media/java/android/media/MediaCodecInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -93,8 +93,9 @@ public final class MediaCodecInfo { 
        public final static int COLOR_Format24BitABGR6666           = 43;



        public final static int COLOR_TI_FormatYUV420PackedSemiPlanar = 0x7f000100;

        /** @hide -- TODO(fadden): make this public before release */

        public final static int COLOR_FormatAndroidOpaque             = 0x7F000789;

        // COLOR_FormatSurface indicates that the data will be a GraphicBuffer metadata reference.

        // In OMX this is called OMX_COLOR_FormatAndroidOpaque.

        public final static int COLOR_FormatSurface                   = 0x7F000789;

        public final static int COLOR_QCOM_FormatYUV420SemiPlanar     = 0x7fa30c00;



        /**

opengl/java/android/opengl/EGL14.java

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; 


    // C function EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time )



    /** @hide -- TODO(fadden) unhide this */

    public static native boolean eglPresentationTimeANDROID(

        EGLDisplay dpy,

        EGLSurface sur,