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

Unified Diff: media/mojo/services/mojo_cdm.cc

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm.cc
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 7822700e99bf89d767af1f84e75baa236608a150..ed2a82f3c6f5a51401caed301cc5bc615d9438bc 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -6,7 +6,9 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "media/base/cdm_key_information.h"
#include "media/base/cdm_promise.h"
+#include "media/mojo/services/media_type_converters.h"
#include "mojo/public/cpp/application/connect.h"
#include "mojo/public/cpp/bindings/interface_impl.h"
#include "mojo/public/interfaces/application/service_provider.mojom.h"
@@ -141,9 +143,18 @@ void MojoCdm::OnSessionError(const mojo::String& session_id,
system_code, error_message);
}
-void MojoCdm::OnSessionKeysChange(const mojo::String& session_id,
- bool has_additional_usable_key) {
- session_keys_change_cb_.Run(session_id, has_additional_usable_key);
+void MojoCdm::OnSessionKeysChange(
+ const mojo::String& session_id,
+ bool has_additional_usable_key,
+ mojo::Array<mojo::CdmKeyInformationPtr> keys_info) {
+ media::CdmKeysInfo key_data;
+ key_data.reserve(keys_info.size());
+ for (size_t i = 0; i < keys_info.size(); ++i) {
+ key_data.push_back(
+ keys_info[i].To<scoped_ptr<media::CdmKeyInformation>>().release());
+ }
+ session_keys_change_cb_.Run(session_id, has_additional_usable_key,
+ key_data.Pass());
}
void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698