Bug 1542440 - Recycle sample directly rather than through CodecProxy. r=jya

mJavaDecoder is invalid after the decoder is shut down and should never
be used.

Differential Revision: https://phabricator.services.mozilla.com/D26438

--HG--
extra : moz-landing-system : lando

dom/media/platforms/android/RemoteDataDecoder.cpp

@@ -243,7 +243,7 @@ class RemoteVideoDecoder : public RemoteDataDecoder {
 
     AssertOnTaskQueue();
     if (GetState() == State::SHUTDOWN) {
-      mJavaDecoder->DisposeOutput(aSample);
+      aSample->Dispose();
       return;
     }
 
@@ -427,7 +427,7 @@ class RemoteAudioDecoder : public RemoteDataDecoder {
     AssertOnTaskQueue();
 
     if (GetState() == State::SHUTDOWN || !aBuffer->IsValid()) {
-      mJavaDecoder->DisposeOutput(aSample);
+      aSample->Dispose();
       return;
     }
 

mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/CodecProxy.java

@@ -412,18 +412,6 @@ public final class CodecProxy {
         return true;
     }
 
-    // Dispose Sample objects without sending requests to remote codec.
-    // Native callbacks use this method instead of releaseOutput() to save
-    // unnecessary IPC calls when recycling samples that have been released by
-    // release() or flush().
-    @WrapForJNI
-    public void disposeOutput(final Sample sample) {
-        if (mOutputSurface != null) {
-            mSurfaceOutputs.remove(sample);
-        }
-        sample.dispose();
-    }
-
     /* package */ void reportError(final boolean fatal) {
         mCallbacks.reportError(fatal);
     }

mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/Sample.java

@@ -98,6 +98,7 @@ public final class Sample implements Parcelable {
                        crypto.mode);
     }
 
+    @WrapForJNI
     public void dispose() {
         if (isEOS()) {
             return;