Merge M57: "Make setOutputSurface, encrypted capabilities. Blacklist hi6210sft."

media/base/android/media_codec_util.cc

Index: media/base/android/media_codec_util.cc
diff --git a/media/base/android/media_codec_util.cc b/media/base/android/media_codec_util.cc
index 171991d4ba4e46eff6f2a4e4715238051ae921d6..cf6204ac56557ee9bfac47791ab36380e879c00f 100644
--- a/media/base/android/media_codec_util.cc
+++ b/media/base/android/media_codec_util.cc
@@ -265,6 +265,12 @@ bool MediaCodecUtil::IsSurfaceViewOutputSupported() {
 }
 
 // static
+bool MediaCodecUtil::IsSetOutputSurfaceSupported() {
+  JNIEnv* env = AttachCurrentThread();
+  return Java_MediaCodecUtil_isSetOutputSurfaceSupported(env);
+}
+
+// static
 bool MediaCodecUtil::CodecNeedsFlushWorkaround(MediaCodecBridge* codec) {
   int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int();
   std::string codec_name = codec->GetName();