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

Unified Diff: media/cdm/aes_decryptor.cc

Issue 975983002: Update Clear Key to support keyids formatted init_data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: escape non-ASCII Created 5 years, 10 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 | « no previous file | media/cdm/aes_decryptor_unittest.cc » ('j') | media/cdm/json_web_key.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor.cc
diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index 1bf574d1b12f1bb379b686cbe21f1453c81bdae1..1506f7fc32b2b9f736837fdf659f995fd8d96ce0 100644
--- a/media/cdm/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -273,8 +273,15 @@ void AesDecryptor::CreateSessionAndGenerateRequest(
promise->reject(NOT_SUPPORTED_ERROR, 0, "No supported PSSH box found.");
return;
}
+ } else if (init_data_type == "keyids") {
+ std::string init_data_string(init_data, init_data + init_data_length);
+ std::string error_message;
+ if (!ExtractKeyIdsFromKeyIdsInitData(init_data_string, &keys,
+ &error_message)) {
+ promise->reject(NOT_SUPPORTED_ERROR, 0, error_message);
+ return;
+ }
} else {
- // TODO(jrummell): Support init_data_type == "keyids".
promise->reject(NOT_SUPPORTED_ERROR, 0, "init_data_type not supported.");
return;
}
« no previous file with comments | « no previous file | media/cdm/aes_decryptor_unittest.cc » ('j') | media/cdm/json_web_key.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698