Use the MediaCodec flush workaround in more cases

media/base/android/media_codec_util.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_codec_util.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "jni/MediaCodecUtil_jni.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaIntArrayToIntVector;
 using base::android::ScopedJavaLocalRef;
 
 namespace media {
 
@@ skipping 30 matching lines @@
 }
 
 static bool IsSupportedAndroidMimeType(const std::string& mime_type) {
   std::vector<std::string> supported{
       kMp4aMimeType, kOpusMimeType, kVorbisMimeType, kAvcMimeType,
       kHevcMimeType, kVp8MimeType,  kVp9MimeType};
   return std::find(supported.begin(), supported.end(), mime_type) !=
          supported.end();
 }
 
-static std::string GetDefaultCodecName(const std::string& mime_type,
-                                       MediaCodecDirection direction) {
-  DCHECK(MediaCodecUtil::IsMediaCodecAvailable());
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime_type);
-  ScopedJavaLocalRef<jstring> j_codec_name =
-      Java_MediaCodecUtil_getDefaultCodecName(env, j_mime.obj(), direction);
-  return ConvertJavaStringToUTF8(env, j_codec_name.obj());
-}
-
 static bool IsDecoderSupportedByDevice(const std::string& android_mime_type) {
   DCHECK(MediaCodecUtil::IsMediaCodecAvailable());
   DCHECK(IsSupportedAndroidMimeType(android_mime_type));
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_mime =
       ConvertUTF8ToJavaString(env, android_mime_type);
   return Java_MediaCodecUtil_isDecoderSupportedForDevice(env, j_mime.obj());
 }
 
 // static
 bool MediaCodecUtil::IsMediaCodecAvailable() {
   // MediaCodec is only available on JB and greater.
   if (base::android::BuildInfo::GetInstance()->sdk_int() < 16)
     return false;
   // Blacklist some devices on Jellybean as for MediaCodec support is buggy.
   // http://crbug.com/365494.
   if (base::android::BuildInfo::GetInstance()->sdk_int() == 16) {
     std::string model(base::android::BuildInfo::GetInstance()->model());
     return model != "GT-I9100" && model != "GT-I9300" && model != "GT-N7000";
   }
   return true;
 }
 
 // static
+std::string MediaCodecUtil::GetDefaultCodecName(const std::string& mime_type,

[DaleCurtis, 2016/04/23 19:06:21]

Is this even necessary if our blacklist really only affects api >= 18?

+                                                MediaCodecDirection direction) {
+  DCHECK(MediaCodecUtil::IsMediaCodecAvailable());
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime_type);
+  ScopedJavaLocalRef<jstring> j_codec_name =
+      Java_MediaCodecUtil_getDefaultCodecName(env, j_mime.obj(), direction);
+  return ConvertJavaStringToUTF8(env, j_codec_name.obj());
+}
+
+// static
 bool MediaCodecUtil::SupportsSetParameters() {
   // MediaCodec.setParameters() is only available starting with K.
   return base::android::BuildInfo::GetInstance()->sdk_int() >= 19;
 }
 
 // static
 std::set<int> MediaCodecUtil::GetEncoderColorFormats(
     const std::string& mime_type) {
   std::set<int> color_formats;
   if (!IsMediaCodecAvailable())
@@ skipping 110 matching lines @@
   // Disable SurfaceView output for the Samsung Galaxy S3; it does not work
   // well enough for even 360p24 H264 playback.  http://crbug.com/602870.
   //
   // Notably this is codec agnostic at present, so any devices added to
   // the blacklist will avoid trying to play any codecs on SurfaceView.  If
   // needed in the future this can be expanded to be codec specific.
   return !base::StartsWith(base::android::BuildInfo::GetInstance()->model(),
                            "GT-I9300", base::CompareCase::INSENSITIVE_ASCII);
 }
 
+// static
+bool MediaCodecUtil::CodecNeedsFlushWorkaround(MediaCodecBridge* codec) {
+  int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int();
+  std::string codec_name = codec->GetName();
+  return sdk_int < 18 ||
+         (sdk_int == 18 && ("OMX.SEC.avc.dec" == codec_name ||
+                            "OMX.SEC.avc.dec.secure" == codec_name)) ||
+         (sdk_int == 19 &&
+          base::StartsWith(base::android::BuildInfo::GetInstance()->model(),
+                           "SM-G800", base::CompareCase::INSENSITIVE_ASCII) &&

[qinmin, 2016/04/25 22:44:58]

This feels strange, so the same decoder works on other devices with the same
android version, but just not on SM-G800?

[watk, 2016/04/25 22:53:53]

Yeah, perhaps it happens on other devices too, but I guess the only confirmed
device was this one. Exoplayer issue here:
https://github.com/google/ExoPlayer/issues/603

[qinmin, 2016/04/25 23:07:39]

Yes, we should blacklist for all other devices.

+          ("OMX.Exynos.avc.dec" == codec_name ||
+           "OMX.Exynos.avc.dec.secure" == codec_name));
+}
+
 }  // namespace media