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

media/base/android/media_codec_util.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 
 #include <jni.h>
 #include <set>
 #include <string>
@@ skipping 64 matching lines @@
 
   // Indicates if the vp9 decoder is available on this device.
   static bool IsVp9DecoderAvailable();
 
   // Indicates if the h264 encoder is available on this device.
   static bool IsH264EncoderAvailable();
 
   // Indicates if SurfaceView and MediaCodec work well together on this device.
   static bool IsSurfaceViewOutputSupported();
 
+  // Indicates if MediaCodec.setOutputSurface() works on this device.
+  static bool IsSetOutputSurfaceSupported();
+
   // Indicates if the decoder is known to fail when flushed. (b/8125974,
   // b/8347958)
   // When true, the client should work around the issue by releasing the
   // decoder and instantiating a new one rather than flushing the current one.
   static bool CodecNeedsFlushWorkaround(MediaCodecBridge* codec);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_