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

Side by Side Diff: media/base/decrypt_config.cc

Issue 10831115: Revert 149449 - Add support for v0.3 of the encrypted WebM specification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/crypto/aes_decryptor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/decrypt_config.h" 5 #include "media/base/decrypt_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
11 DecryptConfig::DecryptConfig(const std::string& key_id, 11 DecryptConfig::DecryptConfig(const std::string& key_id,
12 const std::string& iv, 12 const std::string& iv,
13 const std::string& checksum, 13 const std::string& checksum,
14 const int data_offset, 14 const int data_offset,
15 const std::vector<SubsampleEntry>& subsamples) 15 const std::vector<SubsampleEntry>& subsamples)
16 : key_id_(key_id), 16 : key_id_(key_id),
17 iv_(iv), 17 iv_(iv),
18 checksum_(checksum), 18 checksum_(checksum),
19 data_offset_(data_offset), 19 data_offset_(data_offset),
20 subsamples_(subsamples) { 20 subsamples_(subsamples) {
21 CHECK_GT(key_id.size(), 0u); 21 CHECK_GT(key_id.size(), 0u);
22 CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || 22 CHECK_EQ(iv.size(), static_cast<size_t>(DecryptConfig::kDecryptionKeySize));
23 iv.empty());
24 CHECK_GE(data_offset, 0); 23 CHECK_GE(data_offset, 0);
25 } 24 }
26 25
27 DecryptConfig::~DecryptConfig() {} 26 DecryptConfig::~DecryptConfig() {}
28 27
29 } // namespace media 28 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/crypto/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698