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

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

Issue 757953002: Add SubsampleEntry constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 years 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
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.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::vector<SubsampleEntry>& subsamples) 13 const std::vector<SubsampleEntry>& subsamples)
14 : key_id_(key_id), 14 : key_id_(key_id),
15 iv_(iv), 15 iv_(iv),
16 subsamples_(subsamples) { 16 subsamples_(subsamples) {
17 CHECK_GT(key_id.size(), 0u); 17 CHECK_GT(key_id.size(), 0u);
18 CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || 18 CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) ||
19 iv.empty()); 19 iv.empty());
20 } 20 }
21 21
22 DecryptConfig::~DecryptConfig() {} 22 DecryptConfig::~DecryptConfig() {}
23 23
24 bool DecryptConfig::Matches(const DecryptConfig& config) const {
25 if (key_id() != config.key_id() || iv() != config.iv() ||
26 subsamples().size() != config.subsamples().size()) {
27 return false;
28 }
29
30 for (size_t i = 0; i < subsamples().size(); ++i) {
31 if ((subsamples()[i].clear_bytes != config.subsamples()[i].clear_bytes) ||
32 (subsamples()[i].cypher_bytes != config.subsamples()[i].cypher_bytes)) {
33 return false;
34 }
35 }
36
37 return true;
38 }
39
24 } // namespace media 40 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698