Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: media/webm/webm_cluster_parser.cc

Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Satisfy mac_rel buildbot Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mp4/track_run_iterator_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/webm/webm_cluster_parser.cc
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
index 20d131e9b7ee7ed0c369de744c257e1cb62b7edd..14a360d050d5ef148f2c8e08ba844bc8fa4310d7 100644
--- a/media/webm/webm_cluster_parser.cc
+++ b/media/webm/webm_cluster_parser.cc
@@ -235,10 +235,15 @@ bool WebMClusterParser::OnBlock(int track_num, int timecode,
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(
+ reinterpret_cast<const char*>(video_encryption_key_id_.get()),
+ video_encryption_key_id_size_),
+ std::string(
+ reinterpret_cast<const char*>(counter_block.get()),
+ DecryptConfig::kDecryptionKeySize),
+ std::string(reinterpret_cast<const char*>(data), kWebMHmacSize),
+ sizeof(iv),
+ std::vector<SubsampleEntry>())));
}
buffer->SetTimestamp(timestamp);
« no previous file with comments | « media/mp4/track_run_iterator_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698