MP4 support for Common Encryption 'cbcs' scheme.

media/formats/mp4/box_definitions.h

Index: media/formats/mp4/box_definitions.h
diff --git a/media/formats/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h
index 01138801bea9d590af1327fe37527646fb0c8fce..aa07e9134b0d2ab15c0b7a7eec7a2d9df243899c 100644
--- a/media/formats/mp4/box_definitions.h
+++ b/media/formats/mp4/box_definitions.h
@@ -20,6 +20,7 @@
 #include "media/formats/mp4/avc.h"
 #include "media/formats/mp4/box_reader.h"
 #include "media/formats/mp4/fourccs.h"
+#include "media/media_features.h"
 
 namespace media {
 namespace mp4 {
@@ -129,6 +130,12 @@ struct MEDIA_EXPORT TrackEncryption : Box {
   bool is_encrypted;
   uint8_t default_iv_size;
   std::vector<uint8_t> default_kid;
+#if BUILDFLAG(ENABLE_CENC_NEW_EDITIONS)
+  uint8_t default_crypt_byte_block;
+  uint8_t default_skip_byte_block;
+  uint8_t default_constant_iv_size;

[kqyang, 2016/05/23 20:57:34]

Please initialize the values in the constructor or here. Similar below.

[dougsteed, 2016/05/25 17:23:21]

Done.

[kqyang, 2016/05/26 17:34:49]

Initialize is_encrypted and default_iv_size here as well to be consistent?

+  uint8_t default_constant_iv[16];
+#endif
 };
 
 struct MEDIA_EXPORT SchemeInfo : Box {
@@ -143,6 +150,8 @@ struct MEDIA_EXPORT ProtectionSchemeInfo : Box {
   OriginalFormat format;
   SchemeType type;
   SchemeInfo info;
+
+  bool HasSupportedScheme() const;
 };
 
 struct MEDIA_EXPORT MovieHeader : Box {
@@ -282,10 +291,17 @@ struct MEDIA_EXPORT CencSampleEncryptionInfoEntry {
   CencSampleEncryptionInfoEntry();
   CencSampleEncryptionInfoEntry(const CencSampleEncryptionInfoEntry& other);
   ~CencSampleEncryptionInfoEntry();
+  bool Parse(BoxReader* reader);
 
   bool is_encrypted;
   uint8_t iv_size;
   std::vector<uint8_t> key_id;
+#if BUILDFLAG(ENABLE_CENC_NEW_EDITIONS)
+  uint8_t crypt_byte_block;
+  uint8_t skip_byte_block;
+  uint8_t constant_iv_size;
+  uint8_t constant_iv[16];
+#endif
 };
 
 struct MEDIA_EXPORT SampleGroupDescription : Box {  // 'sgpd'.