Add Common Encryption support to BMFF, including subsample decryption.

media/mp4/cenc.h

Index: media/mp4/cenc.h
diff --git a/media/mp4/cenc.h b/media/mp4/cenc.h
index ee23743f5ac9c15fdeaef70d61b03c9f0c233b8a..e558559a9394215428ac7b2e3366335a6ba96766 100644
--- a/media/mp4/cenc.h
+++ b/media/mp4/cenc.h
@@ -8,25 +8,21 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "media/base/decrypt_config.h"
 
 namespace media {
 namespace mp4 {
 
 class BufferReader;
 
-struct SubsampleSizes {
-  uint16 clear_size;
-  uint32 encrypted_size;
-};
-
 struct FrameCENCInfo {
-  std::vector<uint8> iv;
-  std::vector<SubsampleSizes> subsamples;
+  uint8 iv[16];
+  std::vector<SubsampleEntry> subsamples;
 
   FrameCENCInfo();
   ~FrameCENCInfo();
   bool Parse(int iv_size, BufferReader* r);
-  size_t GetTotalSize() const;
+  size_t GetTotalSizeOfSubsamples() const;
 };