diff options
| author | strobe@google.com <strobe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 00:49:59 +0000 |
|---|---|---|
| committer | strobe@google.com <strobe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 00:49:59 +0000 |
| commit | 9746f9132e55a91d2ec3d866711277b874574743 (patch) | |
| tree | b0f6d236afc3515855403363b6e9fe455a6c801d /media/webm | |
| parent | 7db8893ab741949612cebfed89e11d267daacbf9 (diff) | |
| download | chromium_src-9746f9132e55a91d2ec3d866711277b874574743.zip chromium_src-9746f9132e55a91d2ec3d866711277b874574743.tar.gz chromium_src-9746f9132e55a91d2ec3d866711277b874574743.tar.bz2 | |
Add Common Encryption support to BMFF, including subsample decryption.
BUG=132351
TEST=AesDecryptorTest, plus manual playback in browser
Review URL: https://chromiumcodereview.appspot.com/10651006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm')
| -rw-r--r-- | media/webm/webm_cluster_parser.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc index 20d131e..14a360d 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); |