Merge "Revert "media: add new MediaCodec Callback onCodecReleased.""

2 files changed, 0 insertions, 40 deletions

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index e028e3f..fd7fca6 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -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(
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 71457b7..16758d0 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -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();
     }