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

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

Issue 1160983002: Allows support for persistent session types in BrowserCdm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase conflicts with https://codereview.chromium.org/1166453002 Created 5 years, 6 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/android/media_drm_bridge.cc ('k') | no next file » | 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_MEDIA_KEYS_H_ 5 #ifndef MEDIA_BASE_MEDIA_KEYS_H_
6 #define MEDIA_BASE_MEDIA_KEYS_H_ 6 #define MEDIA_BASE_MEDIA_KEYS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 OUTPUT_ERROR, 65 OUTPUT_ERROR,
66 EXCEPTION_MAX = OUTPUT_ERROR 66 EXCEPTION_MAX = OUTPUT_ERROR
67 }; 67 };
68 68
69 // Type of license required when creating/loading a session. 69 // Type of license required when creating/loading a session.
70 // Must be consistent with the values specified in the spec: 70 // Must be consistent with the values specified in the spec:
71 // https://w3c.github.io/encrypted-media/#idl-def-MediaKeySessionType 71 // https://w3c.github.io/encrypted-media/#idl-def-MediaKeySessionType
72 enum SessionType { 72 enum SessionType {
73 TEMPORARY_SESSION, 73 TEMPORARY_SESSION,
74 PERSISTENT_LICENSE_SESSION, 74 PERSISTENT_LICENSE_SESSION,
75 PERSISTENT_RELEASE_MESSAGE_SESSION 75 PERSISTENT_RELEASE_MESSAGE_SESSION,
76 SESSION_TYPE_MAX = PERSISTENT_RELEASE_MESSAGE_SESSION
76 }; 77 };
77 78
78 // Type of message being sent to the application. 79 // Type of message being sent to the application.
79 // Must be consistent with the values specified in the spec: 80 // Must be consistent with the values specified in the spec:
80 // https://w3c.github.io/encrypted-media/#idl-def-MediaKeyMessageType 81 // https://w3c.github.io/encrypted-media/#idl-def-MediaKeyMessageType
81 enum MessageType { 82 enum MessageType {
82 LICENSE_REQUEST, 83 LICENSE_REQUEST,
83 LICENSE_RENEWAL, 84 LICENSE_RENEWAL,
84 LICENSE_RELEASE, 85 LICENSE_RELEASE,
85 MESSAGE_TYPE_MAX = LICENSE_RELEASE 86 MESSAGE_TYPE_MAX = LICENSE_RELEASE
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 bool has_additional_usable_key, 169 bool has_additional_usable_key,
169 CdmKeysInfo keys_info)> SessionKeysChangeCB; 170 CdmKeysInfo keys_info)> SessionKeysChangeCB;
170 171
171 typedef base::Callback<void(const std::string& session_id, 172 typedef base::Callback<void(const std::string& session_id,
172 const base::Time& new_expiry_time)> 173 const base::Time& new_expiry_time)>
173 SessionExpirationUpdateCB; 174 SessionExpirationUpdateCB;
174 175
175 } // namespace media 176 } // namespace media
176 177
177 #endif // MEDIA_BASE_MEDIA_KEYS_H_ 178 #endif // MEDIA_BASE_MEDIA_KEYS_H_
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698