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

Side by Side Diff: chromecast/media/cdm/cast_cdm.cc

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)
Patch Set: comments addressed Created 4 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 | « chromecast/media/cdm/cast_cdm.h ('k') | chromecast/media/cdm/cast_cdm_factory.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 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 #include "chromecast/media/cdm/cast_cdm.h" 5 #include "chromecast/media/cdm/cast_cdm.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 void CastCdm::UnregisterPlayer(int registration_id) { 100 void CastCdm::UnregisterPlayer(int registration_id) {
101 DCHECK(thread_checker_.CalledOnValidThread()); 101 DCHECK(thread_checker_.CalledOnValidThread());
102 player_tracker_impl_->UnregisterPlayer(registration_id); 102 player_tracker_impl_->UnregisterPlayer(registration_id);
103 } 103 }
104 104
105 ::media::CdmContext* CastCdm::GetCdmContext() { 105 ::media::CdmContext* CastCdm::GetCdmContext() {
106 return cast_cdm_context_.get(); 106 return cast_cdm_context_.get();
107 } 107 }
108 108
109 void CastCdm::OnSessionMessage(const std::string& session_id, 109 void CastCdm::OnSessionMessage(
110 const std::vector<uint8_t>& message, 110 const std::string& session_id,
111 ::media::MediaKeys::MessageType message_type) { 111 const std::vector<uint8_t>& message,
112 ::media::ContentDecryptionModule::MessageType message_type) {
112 session_message_cb_.Run(session_id, message_type, message); 113 session_message_cb_.Run(session_id, message_type, message);
113 } 114 }
114 115
115 void CastCdm::OnSessionClosed(const std::string& session_id) { 116 void CastCdm::OnSessionClosed(const std::string& session_id) {
116 session_closed_cb_.Run(session_id); 117 session_closed_cb_.Run(session_id);
117 } 118 }
118 119
119 void CastCdm::OnSessionKeysChange(const std::string& session_id, 120 void CastCdm::OnSessionKeysChange(const std::string& session_id,
120 bool newly_usable_keys, 121 bool newly_usable_keys,
121 ::media::CdmKeysInfo keys_info) { 122 ::media::CdmKeysInfo keys_info) {
(...skipping 14 matching lines...) Expand all
136 keys_info->push_back(cdm_key_information.release()); 137 keys_info->push_back(cdm_key_information.release());
137 } 138 }
138 } 139 }
139 140
140 // A default empty implementation for subclasses that don't need to provide 141 // A default empty implementation for subclasses that don't need to provide
141 // any key system specific initialization. 142 // any key system specific initialization.
142 void CastCdm::InitializeInternal() {} 143 void CastCdm::InitializeInternal() {}
143 144
144 } // namespace media 145 } // namespace media
145 } // namespace chromecast 146 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cdm/cast_cdm.h ('k') | chromecast/media/cdm/cast_cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698