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

media/base/android/media_codec_util.h

Index: media/base/android/media_codec_util.h
diff --git a/media/base/android/media_codec_util.h b/media/base/android/media_codec_util.h
index e0774f172b0f4af9b031ac8baa8bdec2763a5797..fb3b5ac4475c33e191017616493d25e66408c234 100644
--- a/media/base/android/media_codec_util.h
+++ b/media/base/android/media_codec_util.h
@@ -82,6 +82,9 @@ class MEDIA_EXPORT MediaCodecUtil {
   // 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