Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: rename MediaCodec.setSurface to setOutputSurface

Browse Source 
Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
This commit is contained in:
Lajos Molnar
2015-05-13 14:39:55 -07:00
parent ae8fcaf4c3
commit 6b7ef3725e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

2
media/java/android/media/MediaCodec.java
View File

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