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

Unified Diff: content/renderer/media/crypto/ppapi_decryptor.cc

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GN changes Created 5 years, 12 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
Index: content/renderer/media/crypto/ppapi_decryptor.cc
diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc
index bb5179f11932c80db21da6854353f0bc65b4fa3b..69412a03bdfc09aa57d17e7ebe9851a98e3132fd 100644
--- a/content/renderer/media/crypto/ppapi_decryptor.cc
+++ b/content/renderer/media/crypto/ppapi_decryptor.cc
@@ -13,6 +13,7 @@
#include "content/renderer/pepper/content_decryptor_delegate.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "media/base/audio_decoder_config.h"
+#include "media/base/cdm_key_information.h"
#include "media/base/data_buffer.h"
#include "media/base/decoder_buffer.h"
#include "media/base/key_systems.h"
@@ -393,8 +394,10 @@ void PpapiDecryptor::OnSessionMessage(const std::string& web_session_id,
session_message_cb_.Run(web_session_id, message, destination_url);
}
-void PpapiDecryptor::OnSessionKeysChange(const std::string& web_session_id,
- bool has_additional_usable_key) {
+void PpapiDecryptor::OnSessionKeysChange(
+ const std::string& web_session_id,
+ bool has_additional_usable_key,
+ const media::CdmKeyInformationVector& key_information) {
DCHECK(render_loop_proxy_->BelongsToCurrentThread());
// TODO(jrummell): Handling resume playback should be done in the media
@@ -402,7 +405,8 @@ void PpapiDecryptor::OnSessionKeysChange(const std::string& web_session_id,
if (has_additional_usable_key)
AttemptToResumePlayback();
- session_keys_change_cb_.Run(web_session_id, has_additional_usable_key);
+ session_keys_change_cb_.Run(web_session_id, has_additional_usable_key,
+ key_information);
}
void PpapiDecryptor::OnSessionExpirationUpdate(

Powered by Google App Engine
This is Rietveld 408576698