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

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

Issue 119203003: Drop DecryptConfig::data_offset_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 11 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
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 int data_offset,
14 const std::vector<SubsampleEntry>& subsamples) 13 const std::vector<SubsampleEntry>& subsamples)
15 : key_id_(key_id), 14 : key_id_(key_id),
16 iv_(iv), 15 iv_(iv),
17 data_offset_(data_offset),
18 subsamples_(subsamples) { 16 subsamples_(subsamples) {
19 CHECK_GT(key_id.size(), 0u); 17 CHECK_GT(key_id.size(), 0u);
20 CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || 18 CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) ||
21 iv.empty()); 19 iv.empty());
22 CHECK_GE(data_offset, 0);
23 } 20 }
24 21
25 DecryptConfig::~DecryptConfig() {} 22 DecryptConfig::~DecryptConfig() {}
26 23
27 } // namespace media 24 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698