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

Side by Side Diff: media/blink/encrypted_media_player_support.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 5 #ifndef MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
6 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 6 #define MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 unsigned init_data_length, 81 unsigned init_data_length,
82 const std::string& session_id); 82 const std::string& session_id);
83 83
84 blink::WebMediaPlayer::MediaKeyException CancelKeyRequestInternal( 84 blink::WebMediaPlayer::MediaKeyException CancelKeyRequestInternal(
85 const std::string& key_system, 85 const std::string& key_system,
86 const std::string& session_id); 86 const std::string& session_id);
87 87
88 void OnKeyAdded(const std::string& session_id); 88 void OnKeyAdded(const std::string& session_id);
89 void OnKeyError(const std::string& session_id, 89 void OnKeyError(const std::string& session_id,
90 MediaKeys::KeyError error_code, 90 MediaKeys::KeyError error_code,
91 uint32 system_code); 91 uint32_t system_code);
92 void OnKeyMessage(const std::string& session_id, 92 void OnKeyMessage(const std::string& session_id,
93 const std::vector<uint8>& message, 93 const std::vector<uint8_t>& message,
94 const GURL& destination_url); 94 const GURL& destination_url);
95 95
96 CdmFactory* cdm_factory_; 96 CdmFactory* cdm_factory_;
97 97
98 blink::WebMediaPlayerEncryptedMediaClient* client_; 98 blink::WebMediaPlayerEncryptedMediaClient* client_;
99 99
100 MediaPermission* media_permission_; 100 MediaPermission* media_permission_;
101 101
102 // The currently selected key system. Empty string means that no key system 102 // The currently selected key system. Empty string means that no key system
103 // has been selected. 103 // has been selected.
104 std::string current_key_system_; 104 std::string current_key_system_;
105 105
106 // We assume all streams are from the same container, thus have the same 106 // We assume all streams are from the same container, thus have the same
107 // init data type. 107 // init data type.
108 EmeInitDataType init_data_type_; 108 EmeInitDataType init_data_type_;
109 109
110 CdmContextReadyCB cdm_context_ready_cb_; 110 CdmContextReadyCB cdm_context_ready_cb_;
111 111
112 // Manages decryption keys and decrypts encrypted frames. 112 // Manages decryption keys and decrypts encrypted frames.
113 scoped_ptr<ProxyDecryptor> proxy_decryptor_; 113 scoped_ptr<ProxyDecryptor> proxy_decryptor_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport); 115 DISALLOW_COPY_AND_ASSIGN(EncryptedMediaPlayerSupport);
116 }; 116 };
117 117
118 } // namespace media 118 } // namespace media
119 119
120 #endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_ 120 #endif // MEDIA_BLINK_ENCRYPTED_MEDIA_PLAYER_SUPPORT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698