wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset f51c32dbea00 (bug 875573) for test_can_play_type_mpeg.html orange

Browse Source
This commit is contained in:
Wes Kocher 2015-08-20 16:19:39 -07:00
parent ba0c145410
commit 54b7c0eff4
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/media/DecoderTraits.cpp
View File

@ -226,7 +226,6 @@ static const char* const gOmxTypes[] = {
"audio/3gpp", "audio/3gpp",
"audio/flac", "audio/flac",
"video/mp4", "video/mp4",
"video/x-m4v",
"video/3gpp", "video/3gpp",
"video/3gpp2", "video/3gpp2",
"video/quicktime", "video/quicktime",
@ -333,7 +332,7 @@ IsAndroidMediaType(const nsACString& aType)
} }
static const char* supportedTypes[] = { static const char* supportedTypes[] = {
"audio/mpeg", "audio/mp4", "video/mp4", "video/x-m4v", nullptr "audio/mpeg", "audio/mp4", "video/mp4", nullptr
}; };
return CodecListContains(supportedTypes, aType); return CodecListContains(supportedTypes, aType);
} }

2
dom/media/fmp4/MP4Decoder.cpp
View File

@ -148,7 +148,7 @@ MP4Decoder::CanHandleMediaType(const nsACString& aType,
} }
#endif #endif
if ((!aType.EqualsASCII("video/mp4") && !aType.EqualsASCII("video/x-m4v")) || if (!aType.EqualsASCII("video/mp4") ||
!MP4Decoder::CanCreateH264Decoder()) { !MP4Decoder::CanCreateH264Decoder()) {
return false; return false;
} }

2
dom/media/test/test_can_play_type_mpeg.html
View File

@ -26,13 +26,11 @@ function check_mp4(v, enabled) {
} }
check("video/mp4", "maybe"); check("video/mp4", "maybe");
check("video/x-m4v", "maybe");
check("audio/mp4", "maybe"); check("audio/mp4", "maybe");
check("audio/x-m4a", "maybe"); check("audio/x-m4a", "maybe");
// Not the MIME type that other browsers respond to, so we won't either. // Not the MIME type that other browsers respond to, so we won't either.
check("audio/m4a", ""); check("audio/m4a", "");
check("video/m4v", "");
// Only Safari responds affirmatively to "audio/aac", // Only Safari responds affirmatively to "audio/aac",
// so we'll let x-m4a cover aac support. // so we'll let x-m4a cover aac support.
check("audio/aac", ""); check("audio/aac", "");