Add 'cbcs' encryption scheme support in Android media.

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>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/bitstream_buffer.h"
 #include "media/base/cdm_context.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/surface_manager.h"
 #include "media/base/video_decoder_config.h"
 #include "media/video/picture.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 
 typedef unsigned int GLenum;
 
 namespace base {
 class SingleThreadTaskRunner;
@@ skipping 95 matching lines @@
     Config();
     Config(const Config& config);
 
     // Intentional converting constructor.
     // TODO(watk): Make this explicit.
     Config(VideoCodecProfile profile);
 
     ~Config();
 
     std::string AsHumanReadableString() const;
+    bool is_encrypted() const { return encryption_scheme.is_encrypted(); }
 
     // The video codec and profile.
     VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN;
 
-    // Whether the stream is encrypted.
-    bool is_encrypted = false;
+    // Whether the stream is encrypted, and, if so, the scheme used.
+    EncryptionScheme encryption_scheme;
 
     // The CDM that the VDA should use to decode encrypted streams. Must be
     // set to a valid ID if |is_encrypted|.
     int cdm_id = CdmContext::kInvalidCdmId;
 
     // Whether the client supports deferred initialization.
     bool is_deferred_initialization_allowed = false;
 
     // An optional graphics surface that the VDA should render to. For setting
     // an output SurfaceView on Android. It's only valid when not equal to
@@ skipping 196 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_