Fix and update MediaCodec blacklist.

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 <unordered_map>
 
 #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_piece.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;
+using base::android::SDK_VERSION_JELLY_BEAN_MR2;
+using base::android::SDK_VERSION_KITKAT;
+using base::android::SDK_VERSION_LOLLIPOP_MR1;
 
 namespace media {
 
 namespace {
 
 const char kMp4aMimeType[] = "audio/mp4a-latm";
 const char kOpusMimeType[] = "audio/opus";
 const char kVorbisMimeType[] = "audio/vorbis";
 const char kAc3MimeType[] = "audio/ac3";
 const char kEac3MimeType[] = "audio/eac3";
@@ skipping 61 matching lines @@
 static bool IsEncoderSupportedByDevice(const std::string& android_mime_type) {
   DCHECK(MediaCodecUtil::IsMediaCodecAvailable());
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_mime =
       ConvertUTF8ToJavaString(env, android_mime_type);
   return Java_MediaCodecUtil_isEncoderSupportedByDevice(env, j_mime);
 }
 
 // static
 bool MediaCodecUtil::IsMediaCodecAvailable() {
+  return IsMediaCodecAvailableForSdk(
+      base::android::BuildInfo::GetInstance()->sdk_int(), nullptr);
+}
+
+// static
+bool MediaCodecUtil::IsMediaCodecAvailableForSdk(int sdk,
+                                                 const char* model_for_test) {
   // Blacklist some devices on Jellybean as MediaCodec is buggy.
   // http://crbug.com/365494, http://crbug.com/615872
   // Blacklist Lenovo A6600 / A6800 on KitKat, which tends to crash a lot.
   // See crbug.com/628059 .  We include < K since they don't exist.
   // Blacklist Samsung Galaxy Star Pro (GT-S7262) (crbug.com/634920).
   // GT-S5282 and GT-I8552 are for crbug.com/634920 .
-  if (base::android::BuildInfo::GetInstance()->sdk_int() <= 19) {
-    std::string model(base::android::BuildInfo::GetInstance()->model());
-    return model != "GT-I9100" && model != "GT-I9300" && model != "GT-N7000" &&
-           model != "GT-N7100" && model != "A6600" && model != "A6800" &&
-           model != "GT-S7262" && model != "GT-S5282" && model != "GT-I8552";
-  } else if (base::android::BuildInfo::GetInstance()->sdk_int() < 19) {
-    // For JB, these tend to fail often (crbug.com/654905), but not with K+.
-    std::string model(base::android::BuildInfo::GetInstance()->model());
-    return model != "GT-P3113" && model != "GT-P5110" && model != "GT-P5100" &&
-           model != "GT-P5113" && model != "GT-P3110" && model != "GT-N5110" &&
-           model != "e-tab4" && model != "GT-I8200Q";
-  }
+  // Blacklist LGMS330 on L for crbug.com/654905 .
 
-  return true;
+  // None of our tests fail >= marshmallow.
+  if (sdk >= base::android::SDK_VERSION_MARSHMALLOW)
+    return true;
+
+  // ["model name"] == last bad sdk revision.  We will blacklist the model on
+  // any sdk that is as old or older.
+  static std::unordered_map<base::StringPiece, int, base::StringPieceHash>

[DaleCurtis, 2017/02/09 18:31:14]

static const.

[liberato (no reviews please), 2017/02/09 18:38:56]

Done.

+      blacklist = {
+          {"LGMS330", SDK_VERSION_LOLLIPOP_MR1},
+
+          {"GT-I9100", SDK_VERSION_KITKAT},
+          {"GT-I9300", SDK_VERSION_KITKAT},
+          {"GT-N7000", SDK_VERSION_KITKAT},
+          {"GT-N7100", SDK_VERSION_KITKAT},
+          {"A6600", SDK_VERSION_KITKAT},
+          {"A6800", SDK_VERSION_KITKAT},
+          {"GT-S7262", SDK_VERSION_KITKAT},
+          {"GT-S5282", SDK_VERSION_KITKAT},
+          {"GT-I8552", SDK_VERSION_KITKAT},
+
+          {"GT-P3113", SDK_VERSION_JELLY_BEAN_MR2},
+          {"GT-P5110", SDK_VERSION_JELLY_BEAN_MR2},
+          {"GT-P5100", SDK_VERSION_JELLY_BEAN_MR2},
+          {"GT-P5113", SDK_VERSION_JELLY_BEAN_MR2},
+          {"GT-P3110", SDK_VERSION_JELLY_BEAN_MR2},
+          {"GT-N5110", SDK_VERSION_JELLY_BEAN_MR2},
+          {"e-tab4", SDK_VERSION_JELLY_BEAN_MR2},
+          {"GT-I8200Q", SDK_VERSION_JELLY_BEAN_MR2},
+      };
+
+  const auto iter = blacklist.find(
+      model_for_test ? model_for_test
+                     : base::android::BuildInfo::GetInstance()->model());
+  return iter == blacklist.end() || sdk > iter->second;
 }
 
 // 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(
@@ skipping 135 matching lines @@
          (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) &&
           ("OMX.Exynos.avc.dec" == codec_name ||
            "OMX.Exynos.avc.dec.secure" == codec_name));
 }
 
 }  // namespace media