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

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

Issue 959503002: BrowserCdmManager: Do not pass MIME types as init_data_type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add USE_PROPRIETARY_CODECS guards to fix Android GN build (see crbug.com/461901). 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 | « content/common/media/cdm_messages_enums.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/crypto/proxy_media_keys.cc
diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
index fca2757f85bf0973a138c2e5bb48869eb6085c25..fd6626ffec0a8d5a2ba5c78004a78926cf0fab16 100644
--- a/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -66,9 +66,9 @@ void ProxyMediaKeys::CreateSessionAndGenerateRequest(
// See http://crbug.com/342510
CdmHostMsg_CreateSession_InitDataType create_session_init_data_type;
if (init_data_type == "cenc") {
- create_session_init_data_type = CREATE_SESSION_TYPE_MP4;
+ create_session_init_data_type = INIT_DATA_TYPE_CENC;
} else if (init_data_type == "webm") {
- create_session_init_data_type = CREATE_SESSION_TYPE_WEBM;
+ create_session_init_data_type = INIT_DATA_TYPE_WEBM;
} else {
DLOG(ERROR) << "Unsupported EME CreateSession content type of "
<< init_data_type;
« no previous file with comments | « content/common/media/cdm_messages_enums.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698