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

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>
 
@@ skipping 247 matching lines @@
     if (base::StartsWith(model, model_prefixes[i],
                          base::CompareCase::INSENSITIVE_ASCII)) {
       return false;
     }
   }
 
   return true;
 }
 
 // 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();
   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) &&
           ("OMX.Exynos.avc.dec" == codec_name ||
            "OMX.Exynos.avc.dec.secure" == codec_name));
 }
 
 }  // namespace media