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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 616183002: Revert of 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 | content/renderer/media/crypto/encrypted_media_player_support_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 4f8500a70608d916fbd477d1026ba7c893a5ab01..ea6ba1f0d538dcbb96d046e39c9af674aca353da 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1483,11 +1483,11 @@
// so we keep it as simple as possible without breaking major use cases.
static std::string GuessInitDataType(const unsigned char* init_data,
unsigned init_data_length) {
- // Most WebM files use KeyId of 16 bytes. CENC init data is always >16 bytes.
+ // Most WebM files use KeyId of 16 bytes. MP4 init data are always >16 bytes.
if (init_data_length == 16)
- return "webm";
-
- return "cenc";
+ return "video/webm";
+
+ return "video/mp4";
}
// TODO(xhwang): Report an error when there is encrypted stream but EME is
« no previous file with comments | « no previous file | content/renderer/media/crypto/encrypted_media_player_support_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698