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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/base/demuxer.h » ('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 <stddef.h>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
9 11
10 namespace media { 12 namespace media {
11 13
12 DecryptConfig::DecryptConfig(const std::string& key_id, 14 DecryptConfig::DecryptConfig(const std::string& key_id,
13 const std::string& iv, 15 const std::string& iv,
14 const std::vector<SubsampleEntry>& subsamples) 16 const std::vector<SubsampleEntry>& subsamples)
15 : key_id_(key_id), 17 : key_id_(key_id),
16 iv_(iv), 18 iv_(iv),
(...skipping 28 matching lines...) Expand all
45 os << " subsamples:["; 47 os << " subsamples:[";
46 for (const SubsampleEntry& entry : subsamples_) { 48 for (const SubsampleEntry& entry : subsamples_) {
47 os << "(clear:" << entry.clear_bytes << ", cypher:" << entry.cypher_bytes 49 os << "(clear:" << entry.clear_bytes << ", cypher:" << entry.cypher_bytes
48 << ")"; 50 << ")";
49 } 51 }
50 os << "]"; 52 os << "]";
51 return os; 53 return os;
52 } 54 }
53 55
54 } // namespace media 56 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decrypt_config.h ('k') | media/base/demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698