diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-09 22:29:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-09 22:29:14 +0000 |
| commit | 564eb45b0084318c76e0f69bd986036fab7688c8 (patch) | |
| tree | df34035ab8c6c3ba9a35decca44ab7b132b899d2 /api | |
| parent | 95f534143d5a5bdc054142229ea9d7b9bc956719 (diff) | |
| parent | 4c302e8b141cd490733130e86e44fa4f216de457 (diff) | |
| download | frameworks_base-564eb45b0084318c76e0f69bd986036fab7688c8.zip frameworks_base-564eb45b0084318c76e0f69bd986036fab7688c8.tar.gz frameworks_base-564eb45b0084318c76e0f69bd986036fab7688c8.tar.bz2 | |
Merge "media: add new MediaCodec Callback onCodecReleased."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a13ff67..14ae0c0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14993,6 +14993,7 @@ package android.media { field public static final java.lang.String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync"; field public static final java.lang.String PARAMETER_KEY_SUSPEND = "drop-input-frames"; field public static final java.lang.String PARAMETER_KEY_VIDEO_BITRATE = "video-bitrate"; + field public static final int REASON_RECLAIMED = 1; // 0x1 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 } @@ -15008,6 +15009,7 @@ package android.media { public static abstract class MediaCodec.Callback { ctor public MediaCodec.Callback(); + method public void onCodecReleased(android.media.MediaCodec, int); method public abstract void onError(android.media.MediaCodec, android.media.MediaCodec.CodecException); method public abstract void onInputBufferAvailable(android.media.MediaCodec, int); method public abstract void onOutputBufferAvailable(android.media.MediaCodec, int, android.media.MediaCodec.BufferInfo); diff --git a/api/system-current.txt b/api/system-current.txt index 310de53..c86dfb9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16202,6 +16202,7 @@ package android.media { field public static final java.lang.String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync"; field public static final java.lang.String PARAMETER_KEY_SUSPEND = "drop-input-frames"; field public static final java.lang.String PARAMETER_KEY_VIDEO_BITRATE = "video-bitrate"; + field public static final int REASON_RECLAIMED = 1; // 0x1 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 } @@ -16217,6 +16218,7 @@ package android.media { public static abstract class MediaCodec.Callback { ctor public MediaCodec.Callback(); + method public void onCodecReleased(android.media.MediaCodec, int); method public abstract void onError(android.media.MediaCodec, android.media.MediaCodec.CodecException); method public abstract void onInputBufferAvailable(android.media.MediaCodec, int); method public abstract void onOutputBufferAvailable(android.media.MediaCodec, int, android.media.MediaCodec.BufferInfo); |