Index: talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java |
diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java |
index 42af9c7fd00e8c618cfbc48fb27e49cd481f9b22..697f664ccd22dcae86fe00cb0e35c44794412e44 100644 |
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java |
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java |
@@ -43,6 +43,7 @@ import org.webrtc.Logging; |
import java.nio.ByteBuffer; |
import java.util.Arrays; |
import java.util.List; |
+import java.util.concurrent.atomic.AtomicBoolean; |
import javax.microedition.khronos.egl.EGLContext; |
@@ -66,9 +67,13 @@ public class MediaCodecVideoDecoder { |
} |
private static final int DEQUEUE_INPUT_TIMEOUT = 500000; // 500 ms timeout. |
+ private static final int MEDIA_CODEC_RELEASE_TIMEOUT_MS = 5000; // Timeout for codec releasing. |
// Active running decoder instance. Set in initDecode() (called from native code) |
// and reset to null in release() call. |
private static MediaCodecVideoDecoder runningInstance = null; |
+ private static MediaCodecVideoDecoderErrorCallback errorCallback = null; |
magjed_webrtc
2015/10/30 14:01:57
We signal other MediaCodec errors with exceptions
AlexG
2015/10/30 20:07:59
These are different errors. Exceptions and other m
|
+ private static int codecErrors = 0; |
magjed_webrtc
2015/10/30 14:01:57
Why do we need to report the number of codec error
AlexG
2015/10/30 20:07:58
See comment above
|
+ |
private Thread mediaCodecThread; |
private MediaCodec mediaCodec; |
private ByteBuffer[] inputBuffers; |
@@ -105,6 +110,17 @@ public class MediaCodecVideoDecoder { |
private MediaCodecVideoDecoder() { |
} |
+ // MediaCodec error handler - invoked when critical error happens |
+ // which prevents further use of media codec API. |
+ public static interface MediaCodecVideoDecoderErrorCallback { |
+ void onMediaCodecVideoDecoderError(int codecErrors); |
+ } |
+ |
+ public static void setErrorCallback(MediaCodecVideoDecoderErrorCallback errorCallback) { |
magjed_webrtc
2015/10/30 14:01:57
I really don't like hooking stuff up with static f
AlexG
2015/10/30 20:07:58
There is similar to VideoCapturerAndroid.create()
|
+ Logging.d(TAG, "Set error callback"); |
+ MediaCodecVideoDecoder.errorCallback = errorCallback; |
+ } |
+ |
// Helper struct for findVp8Decoder() below. |
private static class DecoderProperties { |
public DecoderProperties(String codecName, int colorFormat) { |
@@ -273,12 +289,48 @@ public class MediaCodecVideoDecoder { |
private void release() { |
Logging.d(TAG, "Java releaseDecoder"); |
checkOnMediaCodecThread(); |
- try { |
- mediaCodec.stop(); |
- mediaCodec.release(); |
- } catch (IllegalStateException e) { |
- Logging.e(TAG, "release failed", e); |
+ |
+ // Run Mediacodec stop() and release() on separate thread since sometime |
+ // Mediacodec.stop() may hang. |
+ final AtomicBoolean releaseDone = new AtomicBoolean(false); |
magjed_webrtc
2015/10/30 14:01:57
I think it would be cleaner to write this with a C
AlexG
2015/10/30 20:07:59
Done.
|
+ |
+ Runnable runMediaCodecRelease = new Runnable() { |
+ @Override |
+ public void run() { |
+ try { |
+ Logging.d(TAG, "Java releaseDecoder on release thread"); |
+ mediaCodec.stop(); |
+ mediaCodec.release(); |
+ Logging.d(TAG, "Java releaseDecoder on release thread done"); |
+ } catch (Exception e) { |
+ Logging.e(TAG, "Media decoder release failed", e); |
+ } |
+ synchronized (releaseDone) { |
+ releaseDone.set(true); |
+ releaseDone.notifyAll(); |
+ } |
+ } |
+ }; |
+ new Thread(runMediaCodecRelease).start(); |
magjed_webrtc
2015/10/30 14:01:57
We have this comment at the top of this file: "Med
AlexG
2015/10/30 20:07:58
I didn't see this requirement in Android docs - I
|
+ |
+ if (!releaseDone.get()) { |
+ synchronized(releaseDone) { |
+ try { |
+ releaseDone.wait(MEDIA_CODEC_RELEASE_TIMEOUT_MS); |
magjed_webrtc
2015/10/30 14:01:57
You should not swallow InterruptedException, i.e.
AlexG
2015/10/30 20:07:58
Done. Thanks! I moved your ThreadUtils changes to
magjed_webrtc
2015/10/30 21:50:37
If you want, just submit the ThreadUtils change in
|
+ } catch (InterruptedException e) { |
+ Logging.e(TAG, "Wait exception.", e); |
+ } |
+ } |
+ } |
+ if (!releaseDone.get()) { |
+ Logging.e(TAG, "Media decoder release timeout"); |
+ codecErrors++; |
+ if (errorCallback != null) { |
+ Logging.e(TAG, "Invoke codec error callback. Errors: " + codecErrors); |
+ errorCallback.onMediaCodecVideoDecoderError(codecErrors); |
+ } |
} |
+ |
mediaCodec = null; |
mediaCodecThread = null; |
runningInstance = null; |