Merge "Revert "media: add new MediaCodec Callback onCodecReleased."" (4823dee9) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -15156,7 +15156,6 @@ 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
		}
		@@ -15172,7 +15171,6 @@ 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);

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -16368,7 +16368,6 @@ 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
		}
		@@ -16384,7 +16383,6 @@ 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);

media/java/android/media/MediaCodec.java

+0 −32

Original line number	Diff line number	Diff line
		@@ -325,13 +325,6 @@ final public class MediaCodec {
		*/
		public static final int BUFFER_FLAG_END_OF_STREAM = 4;

		/**
		* This indicates that the codec is released because the media resources used by the codec
		* have been reclaimed, for example by the resource manager.
		* This is used by the {@link Callback#onCodecReleased} callback.
		*/
		public static final int REASON_RECLAIMED = 1;

		private EventHandler mEventHandler;
		private Callback mCallback;

		@@ -342,7 +335,6 @@ final public class MediaCodec {
		private static final int CB_OUTPUT_AVAILABLE = 2;
		private static final int CB_ERROR = 3;
		private static final int CB_OUTPUT_FORMAT_CHANGE = 4;
		private static final int CB_CODEC_RELEASED = 5;

		private class EventHandler extends Handler {
		private MediaCodec mCodec;
		@@ -413,13 +405,6 @@ final public class MediaCodec {
		break;
		}

		case CB_CODEC_RELEASED:
		{
		int reason = msg.arg2;
		mCallback.onCodecReleased(mCodec, reason);
		break;
		}

		default:
		{
		break;
		@@ -735,7 +720,6 @@ final public class MediaCodec {
		}

		/* Must be in sync with android_media_MediaCodec.cpp */
		private final static int ACTION_FATAL = 0;
		private final static int ACTION_TRANSIENT = 1;
		private final static int ACTION_RECOVERABLE = 2;

		@@ -1670,22 +1654,6 @@ final public class MediaCodec {
		* @param format The new output format.
		*/
		public abstract void onOutputFormatChanged(MediaCodec codec, MediaFormat format);

		/**
		* Called when the underlying codec component has been released.
		* <p>
		* At this point the MediaCodec must be released, as it has moved to terminal
		* Uninitialized state.
		*
		* @param codec The MediaCodec object.
		* @param reason The reason of the release.
		*/
		public void onCodecReleased(MediaCodec codec, int reason) {
		int errorCode = -1;
		String detailMessage = "resources reclaimed";
		onError(codec,
		new CodecException(errorCode, CodecException.ACTION_FATAL, detailMessage));
		}
		}

		private void postEventFromNative(

media/jni/android_media_MediaCodec.cpp

+0 −8

Original line number	Diff line number	Diff line
		@@ -669,14 +669,6 @@ void JMediaCodec::handleCallback(const sp<AMessage> &msg) {
		break;
		}

		case MediaCodec::CB_CODEC_RELEASED:
		{
		if (!msg->findInt32("reason", &arg2)) {
		arg2 = MediaCodec::REASON_UNKNOWN;
		}
		break;
		}

		default:
		TRESPASS();
		}