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

media/video/video_decode_accelerator.h

Index: media/video/video_decode_accelerator.h
diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h
index ffac2dee95d22c820e3a58c3ccf058951ed51b2d..ff18007634a42e3c4f27be85fd75797630b3bf77 100644
--- a/media/video/video_decode_accelerator.h
+++ b/media/video/video_decode_accelerator.h
@@ -80,6 +80,13 @@ class MEDIA_EXPORT VideoDecodeAccelerator {
       // If set, video frames will have COPY_REQUIRED flag which will cause
       // an extra texture copy during composition.
       REQUIRES_TEXTURE_COPY = 1 << 3,
+
+      // Whether the VDA supports encrypted streams or not.
+      SUPPORTS_ENCRYPTED_STREAMS = 1 << 4,
+
+      // If set the decoder does not require a restart in order to switch to
+      // using an external output surface.
+      SUPPORTS_SET_EXTERNAL_OUTPUT_SURFACE = 1 << 5,
     };
 
     SupportedProfiles supported_profiles;