From 6b7ef3725e42d63b7ad3414c7fe545c64ef1b7ea Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Wed, 13 May 2015 14:39:55 -0700 Subject: [PATCH] media: rename MediaCodec.setSurface to setOutputSurface Bug: 21045402 Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e --- api/current.txt | 2 +- api/system-current.txt | 2 +- media/java/android/media/MediaCodec.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index fac703e006bdc..169834971caa9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/api/system-current.txt b/api/system-current.txt index 23187048f2795..b9bc0a67513ec 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 75c46948ceb71..6f28bf66ee344 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -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"); }