Fix HW video codec stack traces reporting.
Print stack traces for active instance only.
Also add Nexus 4 to H.264 encoder blacklist.
R=wzh@webrtc.org
Review URL: https://codereview.webrtc.org/1412833004 .
Cr-Commit-Position: refs/heads/master@{#10329}
diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
index b0fc867..a23d69c 100644
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
@@ -65,7 +65,9 @@
}
private static final int DEQUEUE_INPUT_TIMEOUT = 500000; // 500 ms timeout.
- private static MediaCodecVideoDecoder instance;
+ // Active running decoder instance. Set in initDecode() (called from native code)
+ // and reset to null in release() call.
+ private static MediaCodecVideoDecoder runningInstance = null;
private Thread mediaCodecThread;
private MediaCodec mediaCodec;
private ByteBuffer[] inputBuffers;
@@ -100,7 +102,6 @@
private EglBase eglBase;
private MediaCodecVideoDecoder() {
- instance = this;
}
// Helper struct for findVp8Decoder() below.
@@ -176,8 +177,8 @@
}
public static void printStackTrace() {
- if (instance != null && instance.mediaCodecThread != null) {
- StackTraceElement[] mediaCodecStackTraces = instance.mediaCodecThread.getStackTrace();
+ if (runningInstance != null && runningInstance.mediaCodecThread != null) {
+ StackTraceElement[] mediaCodecStackTraces = runningInstance.mediaCodecThread.getStackTrace();
if (mediaCodecStackTraces.length > 0) {
Logging.d(TAG, "MediaCodecVideoDecoder stacks trace:");
for (StackTraceElement stackTrace : mediaCodecStackTraces) {
@@ -222,6 +223,7 @@
if (sharedContext != null) {
Logging.d(TAG, "Decoder shared EGL Context: " + sharedContext);
}
+ runningInstance = this; // Decoder is now running and can be queried for stack traces.
mediaCodecThread = Thread.currentThread();
try {
this.width = width;
@@ -278,7 +280,7 @@
}
mediaCodec = null;
mediaCodecThread = null;
- instance = null;
+ runningInstance = null;
if (useSurface) {
surface.release();
surface = null;
diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
index dc12dd9..f3f03c1 100644
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
@@ -61,7 +61,9 @@
}
private static final int DEQUEUE_TIMEOUT = 0; // Non-blocking, no wait.
- private static MediaCodecVideoEncoder instance = null;
+ // Active running encoder instance. Set in initDecode() (called from native code)
+ // and reset to null in release() call.
+ private static MediaCodecVideoEncoder runningInstance = null;
private Thread mediaCodecThread;
private MediaCodec mediaCodec;
private ByteBuffer[] outputBuffers;
@@ -78,7 +80,8 @@
// HW H.264 encoder on below devices has poor bitrate control - actual
// bitrates deviates a lot from the target value.
"SAMSUNG-SGH-I337",
- "Nexus 7"
+ "Nexus 7",
+ "Nexus 4"
};
// Bitrate modes - should be in sync with OMX_VIDEO_CONTROLRATETYPE defined
@@ -103,7 +106,6 @@
private ByteBuffer configData = null;
private MediaCodecVideoEncoder() {
- instance = this;
}
// Helper struct for findHwEncoder() below.
@@ -200,8 +202,8 @@
}
public static void printStackTrace() {
- if (instance != null && instance.mediaCodecThread != null) {
- StackTraceElement[] mediaCodecStackTraces = instance.mediaCodecThread.getStackTrace();
+ if (runningInstance != null && runningInstance.mediaCodecThread != null) {
+ StackTraceElement[] mediaCodecStackTraces = runningInstance.mediaCodecThread.getStackTrace();
if (mediaCodecStackTraces.length > 0) {
Logging.d(TAG, "MediaCodecVideoEncoder stacks trace:");
for (StackTraceElement stackTrace : mediaCodecStackTraces) {
@@ -246,6 +248,7 @@
if (properties == null) {
throw new RuntimeException("Can not find HW encoder for " + type);
}
+ runningInstance = this; // Encoder is now running and can be queried for stack traces.
mediaCodecThread = Thread.currentThread();
try {
MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
@@ -311,7 +314,7 @@
}
mediaCodec = null;
mediaCodecThread = null;
- instance = null;
+ runningInstance = null;
Logging.d(TAG, "Java releaseEncoder done");
}
