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

Side by Side Diff: media/base/key_systems.h

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 5 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/fake_text_track_stream.cc ('k') | media/base/key_systems.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef MEDIA_BASE_KEY_SYSTEMS_H_ 5 #ifndef MEDIA_BASE_KEY_SYSTEMS_H_
6 #define MEDIA_BASE_KEY_SYSTEMS_H_ 6 #define MEDIA_BASE_KEY_SYSTEMS_H_
7 7
8 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 #include <vector> 11 #include <vector>
10 12
11 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
12 #include "media/base/eme_constants.h" 14 #include "media/base/eme_constants.h"
13 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
14 16
15 namespace media { 17 namespace media {
16 18
17 // Provides an interface for querying registered key systems. The exposed API is 19 // Provides an interface for querying registered key systems. The exposed API is
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // Helper functions to add container/codec types for testing purposes. 121 // Helper functions to add container/codec types for testing purposes.
120 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32_t mask); 122 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32_t mask);
121 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type, 123 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type,
122 const std::string& codec, 124 const std::string& codec,
123 uint32_t mask); 125 uint32_t mask);
124 #endif // defined(UNIT_TEST) 126 #endif // defined(UNIT_TEST)
125 127
126 } // namespace media 128 } // namespace media
127 129
128 #endif // MEDIA_BASE_KEY_SYSTEMS_H_ 130 #endif // MEDIA_BASE_KEY_SYSTEMS_H_
OLDNEW
« no previous file with comments | « media/base/fake_text_track_stream.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698