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

Commit 907d8afd authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev

parents af9d60af 6b7ef372

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15341,8 +15341,8 @@ package android.media { 
    method public void setCallback(android.media.MediaCodec.Callback);

    method public void setInputSurface(android.view.Surface);

    method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler);

    method public void setOutputSurface(android.view.Surface);

    method public final void setParameters(android.os.Bundle);

    method public void setSurface(android.view.Surface);

    method public final void setVideoScalingMode(int);

    method public final void signalEndOfInputStream();

    method public final void start();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -16575,8 +16575,8 @@ package android.media { 
    method public void setCallback(android.media.MediaCodec.Callback);

    method public void setInputSurface(android.view.Surface);

    method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler);

    method public void setOutputSurface(android.view.Surface);

    method public final void setParameters(android.os.Bundle);

    method public void setSurface(android.view.Surface);

    method public final void setVideoScalingMode(int);

    method public final void signalEndOfInputStream();

    method public final void start();

media/java/android/media/MediaCodec.java

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ final public class MediaCodec { 
     *            surface in the current state.

     *  @throws IllegalArgumentException if the new surface is not of a suitable type for the codec.

     */

    public void setSurface(@NonNull Surface surface) {

    public void setOutputSurface(@NonNull Surface surface) {

        if (!mHasSurface) {

            throw new IllegalStateException("codec was not configured for an output surface");

        }