Add 'cbcs' encryption scheme support in Android media.

media/base/encryption_scheme.h

Index: media/base/encryption_scheme.h
diff --git a/media/base/encryption_scheme.h b/media/base/encryption_scheme.h
index 37bea6710d264390a5b74cd920e10951ff34eba7..901a2940c43f94b3d7235da41264828fab3c13ac 100644
--- a/media/base/encryption_scheme.h
+++ b/media/base/encryption_scheme.h
@@ -42,14 +42,14 @@ class MEDIA_EXPORT EncryptionScheme {
 
     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;

[xhwang, 2016/06/15 05:29:05]

OOC why do we make this change?

Also, the constructor still takes uint32_t...

[dougsteed, 2016/06/15 17:57:38]

Actually, I need to clean this up. I think now that my original use of uint32_t
was a mistake based on a misreading of the spec. I want to clean it up, but I
should probably do it in a separate CL.

 
     // Allow copy and assignment.
   };