Add 'cbcs' encryption scheme support in Android media.

media/base/encryption_scheme.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_ENCRYPTION_SCHEME_H_
 #define MEDIA_BASE_ENCRYPTION_SCHEME_H_
 
 #include <stdint.h>
 
 #include "media/base/media_export.h"
@@ skipping 24 matching lines @@
   // If either of encrypt_blocks or skip_blocks is 0, pattern encryption is
   // disabled.
   class MEDIA_EXPORT Pattern {
    public:
     Pattern();
     Pattern(uint32_t encrypt_blocks, uint32_t skip_blocks);
     ~Pattern();
 
     bool Matches(const Pattern& other) const;
 
-    uint32_t encrypt_blocks() const { return encrypt_blocks_; }
-    uint32_t skip_blocks() const { return skip_blocks_; }
+    uint8_t encrypt_blocks() const { return encrypt_blocks_; }
+    uint8_t skip_blocks() const { return skip_blocks_; }
 
     bool IsInEffect() const;
 
    private:
-    uint32_t encrypt_blocks_ = 0;
-    uint32_t skip_blocks_ = 0;
+    uint8_t encrypt_blocks_ = 0;
+    uint8_t skip_blocks_ = 0;
 
     // Allow copy and assignment.
   };
 
   // The default constructor makes an instance that indicates no encryption.
   EncryptionScheme();
 
   // This constructor allows specification of the cipher mode and the pattern.
   EncryptionScheme(CipherMode mode, const Pattern& pattern);
   ~EncryptionScheme();
 
   bool Matches(const EncryptionScheme& other) const;
 
   bool is_encrypted() const { return mode_ != CIPHER_MODE_UNENCRYPTED; }
   CipherMode mode() const { return mode_; }
   const Pattern& pattern() const { return pattern_; }
 
  private:
   CipherMode mode_ = CIPHER_MODE_UNENCRYPTED;
   Pattern pattern_;
 
   // Allow copy and assignment.
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ENCRYPTION_SCHEME_H_