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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 2085063002: media: Add OutputProtectionProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows compile error Created 4 years, 6 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
« chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h ('K') | « chrome/chrome_browser.gypi ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.h » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/media/chrome_key_systems.cc
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index ba65f65977ea3faf6c69915c2fd82668159cae90..84065f79d815f6613cb171ff7f7624682fbd4774 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -134,6 +134,8 @@ static void AddExternalClearKey(
"org.chromium.externalclearkey.decryptonly";
static const char kExternalClearKeyFileIOTestKeySystem[] =
"org.chromium.externalclearkey.fileiotest";
+ static const char kExternalClearKeyOutputProtectionTestKeySystem[] =
+ "org.chromium.externalclearkey.outputprotectiontest";
static const char kExternalClearKeyInitializeFailKeySystem[] =
"org.chromium.externalclearkey.initializefail";
static const char kExternalClearKeyCrashKeySystem[] =
@@ -158,6 +160,10 @@ static void AddExternalClearKey(
concrete_key_systems->emplace_back(
new ExternalClearKeyProperties(kExternalClearKeyFileIOTestKeySystem));
+ // A key system that triggers output protection test in ClearKeyCdm.
ddorwin 2016/06/23 19:24:28 nit: triggers *the*... Same at 160.
xhwang 2016/06/23 20:53:49 Done.
+ concrete_key_systems->emplace_back(new ExternalClearKeyProperties(
+ kExternalClearKeyOutputProtectionTestKeySystem));
+
// A key system that Chrome thinks is supported by ClearKeyCdm, but actually
// will be refused by ClearKeyCdm. This is to test the CDM initialization
// failure case.
« chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h ('K') | « chrome/chrome_browser.gypi ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.h » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698