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

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

Issue 874663002: Chromecast: updates BrowserCdmCast to handle new BrowserCdm API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rm extra decl Created 5 years, 11 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
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/browser_cdm_cast.h" 5 #include "chromecast/media/cdm/browser_cdm_cast.h"
6 6
7 #include "media/base/cdm_key_information.h"
8
7 namespace chromecast { 9 namespace chromecast {
8 namespace media { 10 namespace media {
9 11
10 BrowserCdmCast::BrowserCdmCast() { 12 BrowserCdmCast::BrowserCdmCast() {
11 } 13 }
12 14
13 BrowserCdmCast::~BrowserCdmCast() { 15 BrowserCdmCast::~BrowserCdmCast() {
14 player_tracker_.NotifyCdmUnset(); 16 player_tracker_.NotifyCdmUnset();
15 } 17 }
16 18
19 void BrowserCdmCast::SetCallbacks(
20 const ::media::SessionMessageCB& session_message_cb,
21 const ::media::SessionClosedCB& session_closed_cb,
22 const ::media::SessionErrorCB& session_error_cb,
23 const ::media::SessionKeysChangeCB& session_keys_change_cb,
24 const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
25 session_message_cb_ = session_message_cb;
26 session_closed_cb_ = session_closed_cb;
27 session_error_cb_ = session_error_cb;
28 session_keys_change_cb_ = session_keys_change_cb;
29 session_expiration_update_cb_ = session_expiration_update_cb;
30 }
31
17 int BrowserCdmCast::RegisterPlayer(const base::Closure& new_key_cb, 32 int BrowserCdmCast::RegisterPlayer(const base::Closure& new_key_cb,
18 const base::Closure& cdm_unset_cb) { 33 const base::Closure& cdm_unset_cb) {
19 return player_tracker_.RegisterPlayer(new_key_cb, cdm_unset_cb); 34 return player_tracker_.RegisterPlayer(new_key_cb, cdm_unset_cb);
20 } 35 }
21 36
22 void BrowserCdmCast::UnregisterPlayer(int registration_id) { 37 void BrowserCdmCast::UnregisterPlayer(int registration_id) {
23 player_tracker_.UnregisterPlayer(registration_id); 38 player_tracker_.UnregisterPlayer(registration_id);
24 } 39 }
25 40
26 void BrowserCdmCast::NotifyKeyAdded() { 41 void BrowserCdmCast::OnSessionMessage(const std::string& web_session_id,
42 const std::vector<uint8>& message,
43 const GURL& destination_url) {
44 // Note: Message type is not supported in Chromecast. Do our best guess here.
45 ::media::MediaKeys::MessageType message_type =
46 destination_url.is_empty() ? ::media::MediaKeys::LICENSE_REQUEST
47 : ::media::MediaKeys::LICENSE_RENEWAL;
48 session_message_cb_.Run(web_session_id,
49 message_type,
50 message,
51 destination_url);
52 }
53
54 void BrowserCdmCast::OnSessionClosed(const std::string& web_session_id) {
55 session_closed_cb_.Run(web_session_id);
56 }
57
58 void BrowserCdmCast::OnSessionKeysChange(
59 const std::string& web_session_id,
60 const ::media::KeyIdAndKeyPairs& keys) {
61 ::media::CdmKeysInfo cdm_keys_info;
62 for (const std::pair<std::string, std::string>& key : keys) {
63 scoped_ptr< ::media::CdmKeyInformation> cdm_key_information(
64 new ::media::CdmKeyInformation());
65 cdm_key_information->key_id.assign(key.first.begin(), key.first.end());
66 cdm_keys_info.push_back(cdm_key_information.release());
67 }
68 session_keys_change_cb_.Run(web_session_id, true, cdm_keys_info.Pass());
69
70 // Notify listeners of a new key.
27 player_tracker_.NotifyNewKey(); 71 player_tracker_.NotifyNewKey();
28 } 72 }
29 73
30 } // namespace media 74 } // namespace media
31 } // namespace chromecast 75 } // namespace chromecast
OLDNEW
« chromecast/media/cdm/browser_cdm_cast.h ('K') | « chromecast/media/cdm/browser_cdm_cast.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698