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

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

Issue 611513005: Pass initDataType instead of contentType on OnNeedKey(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/formats/mp4/mp4_stream_parser.cc » ('j') | media/formats/mp4/mp4_stream_parser.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/crypto/encrypted_media_player_support_impl.cc
diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.cc b/content/renderer/media/crypto/encrypted_media_player_support_impl.cc
index 42f86b6e461d9558a58515dce01ebf8cab9703e2..e3f70b393d18d6e316057648e99da1f20219f456 100644
--- a/content/renderer/media/crypto/encrypted_media_player_support_impl.cc
+++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.cc
@@ -117,11 +117,11 @@ static void ReportMediaKeyExceptionToUMA(const std::string& method,
// so we keep it as simple as possible without breaking major use cases.
static std::string GuessInitDataType(const unsigned char* init_data,
ddorwin 2014/09/26 22:09:18 Fix WMPA too.
sandersd (OOO until July 31) 2014/09/26 22:49:56 Done.
unsigned init_data_length) {
- // Most WebM files use KeyId of 16 bytes. MP4 init data are always >16 bytes.
+ // Most WebM files use KeyId of 16 bytes. CENC init data is always >16 bytes.
if (init_data_length == 16)
- return "video/webm";
+ return "webm";
- return "video/mp4";
+ return "cenc";
}
scoped_ptr<media::EncryptedMediaPlayerSupport>
« no previous file with comments | « no previous file | media/formats/mp4/mp4_stream_parser.cc » ('j') | media/formats/mp4/mp4_stream_parser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698