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 c1fff94ed69eb3d51b1816e606f10b465ae3480f..91de8110b0e99b2f686aa18eec3128dd9f123c43 100644 |
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java |
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java |
@@ -32,6 +32,9 @@ import android.media.MediaCodecInfo; |
import android.media.MediaCodecInfo.CodecCapabilities; |
import android.media.MediaCodecList; |
import android.media.MediaFormat; |
+import android.opengl.EGLContext; |
+import android.opengl.GLES11Ext; |
+import android.opengl.GLES20; |
import android.os.Build; |
import android.view.Surface; |
@@ -62,7 +65,7 @@ public class MediaCodecVideoDecoder { |
} |
private static final int DEQUEUE_INPUT_TIMEOUT = 500000; // 500 ms timeout. |
- private static Thread mediaCodecThread; |
+ private Thread mediaCodecThread; |
private MediaCodec mediaCodec; |
private ByteBuffer[] inputBuffers; |
private ByteBuffer[] outputBuffers; |
@@ -172,18 +175,6 @@ public class MediaCodecVideoDecoder { |
return findDecoder(H264_MIME_TYPE, supportedH264HwCodecPrefixes) != null; |
} |
- public static void printStackTrace() { |
- if (mediaCodecThread != null) { |
- StackTraceElement[] mediaCodecStackTraces = mediaCodecThread.getStackTrace(); |
- if (mediaCodecStackTraces.length > 0) { |
- Logging.d(TAG, "MediaCodecVideoDecoder stacks trace:"); |
- for (StackTraceElement stackTrace : mediaCodecStackTraces) { |
- Logging.d(TAG, stackTrace.toString()); |
- } |
- } |
- } |
- } |
- |
private void checkOnMediaCodecThread() throws IllegalStateException { |
if (mediaCodecThread.getId() != Thread.currentThread().getId()) { |
throw new IllegalStateException( |