admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decrease the amount of maximum outstanding frames for Android HW H.264 decoder.

Browse Source 
BUG=b/28150902
R=pbos@webrtc.org, sakal@webrtc.org

Review URL: https://codereview.webrtc.org/2088353002 .

Cr-Commit-Position: refs/heads/master@{#13302}
This commit is contained in:
Alex Glaznev 2016-06-27 11:51:10 -07:00
parent 56ce49d710
commit d57048433c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/api/java/jni/androidmediacodeccommon.h
View File

@ -54,7 +54,7 @@ enum { kMaxPendingFramesVp8 = 1 };
// Maximum amount of pending frames for VP9 decoder.
enum { kMaxPendingFramesVp9 = 1 };
// Maximum amount of pending frames for H.264 decoder.
enum { kMaxPendingFramesH264 = 8 };
enum { kMaxPendingFramesH264 = 3 };
// Maximum amount of decoded frames for which per-frame logging is enabled.
enum { kMaxDecodedLogFrames = 10 };
// Maximum amount of encoded frames for which per-frame logging is enabled.

5
webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java
View File

@ -619,8 +619,9 @@ public class MediaCodecVideoDecoder {
TimeStamps timeStamps = decodeStartTimeMs.remove();
long decodeTimeMs = SystemClock.elapsedRealtime() - timeStamps.decodeStartTimeMs;
if (decodeTimeMs > MAX_DECODE_TIME_MS) {
Logging.e(TAG, "Very high decode time: " + decodeTimeMs + "ms."
+ " Might be caused by resuming H264 decoding after a pause.");
Logging.e(TAG, "Very high decode time: " + decodeTimeMs + "ms"
+ ". Q size: " + decodeStartTimeMs.size()
+ ". Might be caused by resuming H264 decoding after a pause.");
decodeTimeMs = MAX_DECODE_TIME_MS;
}
return new DecodedOutputBuffer(result,