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

media/video/video_decode_accelerator.h

 // Copyright (c) 2012 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_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 62 matching lines @@
       SUPPORTS_EXTERNAL_OUTPUT_SURFACE = 1 << 1,
 
       // If set, the VDA will use deferred initialization if the config
       // indicates that the client supports it as well.  Refer to
       // NotifyInitializationComplete for more details.
       SUPPORTS_DEFERRED_INITIALIZATION = 1 << 2,
 
       // 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;
     uint32_t flags;
   };
 
   // Enumeration of potential errors generated by the API.
   // Note: Keep these in sync with PP_VideoDecodeError_Dev. Also do not
   // rearrange, reuse or remove values as they are used for gathering UMA
   // statistics.
@@ skipping 265 matching lines @@
 // std::unique_ptr<VideoDecodeAccelerator> uses "Destroy()" instead of trying to
 // use the destructor.
 template <>
 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
   void operator()(media::VideoDecodeAccelerator* vda) const;
 };
 
 }  // namespace std
 
 #endif  // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_