diff options
| author | Jeroen Vreeken <jeroen@vreeken.net> | 2019-07-10 11:05:38 +0200 |
|---|---|---|
| committer | Jeroen Vreeken <jeroen@vreeken.net> | 2019-07-10 11:08:09 +0200 |
| commit | 18f9b185b67120ba88f5e643b7413ca06c497383 (patch) | |
| tree | e07ea39a12a7d6b1e0b7c88cdaf2764ae2ba6836 /dom/media/webm/WebMDecoder.cpp | |
| parent | dd924323c3cda022493cd78d42da190577be20cf (diff) | |
| download | UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.gz UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.lz UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.xz UXP-18f9b185b67120ba88f5e643b7413ca06c497383.zip | |
Allow matroska mime types for video element and MSE
Allow avc (h.264) content in matroska/webm containers
Diffstat (limited to 'dom/media/webm/WebMDecoder.cpp')
| -rw-r--r-- | dom/media/webm/WebMDecoder.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dom/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp index 9575d6e42..37e1e4a33 100644 --- a/dom/media/webm/WebMDecoder.cpp +++ b/dom/media/webm/WebMDecoder.cpp @@ -41,7 +41,7 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs, } const bool isWebMAudio = aMIMETypeExcludingCodecs.EqualsASCII("audio/webm"); - const bool isWebMVideo = aMIMETypeExcludingCodecs.EqualsASCII("video/webm"); + const bool isWebMVideo = aMIMETypeExcludingCodecs.EqualsASCII("video/webm") || aMIMETypeExcludingCodecs.EqualsASCII("video/x-matroska") ; if (!isWebMAudio && !isWebMVideo) { return false; } @@ -74,6 +74,11 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs, continue; } #endif + + if (IsH264CodecString(codec)) { + continue; + } + // Some unsupported codec. return false; } |