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/key_systems.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 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/key_systems.h ('k') | media/base/keyboard_event_counter.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 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 #include "media/base/key_systems.h" 5 #include "media/base/key_systems.h"
6 6
7 #include <stddef.h>
8
7 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
8 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
9 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h"
10 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
11 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
12 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "build/build_config.h"
13 #include "media/base/key_system_info.h" 17 #include "media/base/key_system_info.h"
14 #include "media/base/key_systems_support_uma.h" 18 #include "media/base/key_systems_support_uma.h"
15 #include "media/base/media_client.h" 19 #include "media/base/media_client.h"
16 #include "media/cdm/key_system_names.h" 20 #include "media/cdm/key_system_names.h"
17 #include "third_party/widevine/cdm/widevine_cdm_common.h" 21 #include "third_party/widevine/cdm/widevine_cdm_common.h"
18 22
19 namespace media { 23 namespace media {
20 24
21 const char kClearKeyKeySystem[] = "org.w3.clearkey"; 25 const char kClearKeyKeySystem[] = "org.w3.clearkey";
22 const char kPrefixedClearKeyKeySystem[] = "webkit-org.w3.clearkey"; 26 const char kPrefixedClearKeyKeySystem[] = "webkit-org.w3.clearkey";
(...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 KeySystemsImpl::GetInstance()->AddContainerMask(container, mask); 930 KeySystemsImpl::GetInstance()->AddContainerMask(container, mask);
927 } 931 }
928 932
929 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type, 933 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type,
930 const std::string& codec, 934 const std::string& codec,
931 uint32_t mask) { 935 uint32_t mask) {
932 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); 936 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
933 } 937 }
934 938
935 } // namespace media 939 } // namespace media
OLDNEW
« no previous file with comments | « media/base/key_systems.h ('k') | media/base/keyboard_event_counter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698