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

am fff175ae: Merge "Part of corrections from KLP API Review: Media" into klp-dev

Browse Source 
* commit 'fff175aedc86a176fb6ceafe00fe5a26adc5d909':
  Part of corrections from KLP API Review: Media
This commit is contained in:
Jeff Tinker
2013-09-13 17:22:31 -07:00
committed by Android Git Automerger
parent bb451bda4a fff175aedc
commit 3b3b2efb07
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,6 +294,9 @@ final public class MediaCodec {
*/ */
public native final void flush(); public native final void flush();
/**
* Thrown when a crypto error occurs while queueing a secure input buffer.
*/
public final static class CryptoException extends RuntimeException { public final static class CryptoException extends RuntimeException {
public CryptoException(int errorCode, String detailMessage) { public CryptoException(int errorCode, String detailMessage) {
super(detailMessage); super(detailMessage);
@@ -318,6 +321,9 @@ final public class MediaCodec {
*/ */
public static final int ERROR_RESOURCE_BUSY = 3; public static final int ERROR_RESOURCE_BUSY = 3;
/**
* Retrieve the error code associated with a CryptoException
*/
public int getErrorCode() { public int getErrorCode() {
return mErrorCode; return mErrorCode;
} }
@@ -449,6 +455,9 @@ final public class MediaCodec {
* @param presentationTimeUs The time at which this buffer should be rendered. * @param presentationTimeUs The time at which this buffer should be rendered.
* @param flags A bitmask of flags {@link #BUFFER_FLAG_SYNC_FRAME}, * @param flags A bitmask of flags {@link #BUFFER_FLAG_SYNC_FRAME},
* {@link #BUFFER_FLAG_CODEC_CONFIG} or {@link #BUFFER_FLAG_END_OF_STREAM}. * {@link #BUFFER_FLAG_CODEC_CONFIG} or {@link #BUFFER_FLAG_END_OF_STREAM}.
* @throws CryptoException if an error occurs while attempting to decrypt the buffer.
* An error code associated with the exception helps identify the
* reason for the failure.
*/ */
public native final void queueSecureInputBuffer( public native final void queueSecureInputBuffer(
int index, int index,