commit 79299afa3022560691068678bea711af3781eeb6
author Alex Glaznev <glaznev@google.com> Tue Apr 12 16:39:39 2016 -0700
committer Alex Glaznev <glaznev@google.com> Tue Apr 12 23:39:50 2016 +0000
tree 623c233e2acdd65e4ece1e50ca9ee1dace953a9a
parent bdb7af692f48d4cf2a2e7d13c053facdc57df99a

Enable H.264 HW decoder soft rest.

Also tune up scale thresholds a little.

BUG=b/27674326
R=wzh@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#12337}

webrtc/api/java/jni/androidmediadecoder_jni.cc

diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.cc b/webrtc/api/java/jni/androidmediadecoder_jni.cc
index 9d66f83..c83be18 100644
--- a/webrtc/api/java/jni/androidmediadecoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc
@@ -532,10 +532,9 @@
     codec_.width = inputImage._encodedWidth;
     codec_.height = inputImage._encodedHeight;
     int32_t ret;
-    if (use_surface_ && codecType_ == kVideoCodecVP8) {
-      // Soft codec reset - only for VP8 and surface decoding.
-      // TODO(glaznev): try to use similar approach for H.264
-      // and buffer decoding.
+    if (use_surface_ &&
+        (codecType_ == kVideoCodecVP8 || codecType_ == kVideoCodecH264)) {
+      // Soft codec reset - only for surface decoding.
       ret = codec_thread_->Invoke<int32_t>(Bind(
           &MediaCodecVideoDecoder::ResetDecodeOnCodecThread, this));
     } else {