Add Common Encryption support to BMFF, including subsample decryption.

media/webm/webm_cluster_parser.cc

 // 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.
 
 #include "media/webm/webm_cluster_parser.h"
 
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 #include "media/base/data_buffer.h"
 #include "media/base/decrypt_config.h"
@@ skipping 217 matching lines @@
   scoped_refptr<StreamParserBuffer> buffer =
       StreamParserBuffer::CopyFrom(data + offset, size - offset, is_keyframe);
 
   if (encrypted) {
     uint64 network_iv;
     memcpy(&network_iv, data + kWebMHmacSize, sizeof(network_iv));
     const uint64 iv = base::NetToHost64(network_iv);
 
     scoped_array<uint8> counter_block(GenerateCounterBlock(iv));
     buffer->SetDecryptConfig(scoped_ptr<DecryptConfig>(new DecryptConfig(
-        video_encryption_key_id_.get(), video_encryption_key_id_size_,
-        counter_block.get(), DecryptConfig::kDecryptionKeySize,
-        data, kWebMHmacSize,
-        sizeof(iv))));
+        std::string(video_encryption_key_id_.get(),
+                    video_encryption_key_id_.get() +
+                    video_encryption_key_id_size_),
+        std::string(counter_block.get(),
+                    counter_block.get() + DecryptConfig::kDecryptionKeySize),
+        std::string(data, data + kWebMHmacSize),
+        sizeof(iv),
+        std::vector<SubsampleEntry>())));
   }
 
   buffer->SetTimestamp(timestamp);
   if (cluster_start_time_ == kNoTimestamp())
     cluster_start_time_ = timestamp;
 
   if (block_duration >= 0) {
     buffer->SetDuration(base::TimeDelta::FromMicroseconds(
         block_duration * timecode_multiplier_));
   }
@@ skipping 24 matching lines @@
 
   buffers_.push_back(buffer);
   return true;
 }
 
 void WebMClusterParser::Track::Reset() {
   buffers_.clear();
 }
 
 }  // namespace media