diff options
| author | Jeroen Vreeken <jeroen@vreeken.net> | 2019-07-11 16:36:22 +0200 |
|---|---|---|
| committer | Jeroen Vreeken <jeroen@vreeken.net> | 2019-07-11 16:36:22 +0200 |
| commit | 31addeaac8841867008699478ef55e1c1b3d68a7 (patch) | |
| tree | cd580c19b66ce62987ece8df5d2ba7384c329502 /dom/media/webm | |
| parent | 18f9b185b67120ba88f5e643b7413ca06c497383 (diff) | |
| download | UXP-31addeaac8841867008699478ef55e1c1b3d68a7.tar UXP-31addeaac8841867008699478ef55e1c1b3d68a7.tar.gz UXP-31addeaac8841867008699478ef55e1c1b3d68a7.tar.lz UXP-31addeaac8841867008699478ef55e1c1b3d68a7.tar.xz UXP-31addeaac8841867008699478ef55e1c1b3d68a7.zip | |
Make matroska mime type checking more consistent.
Diffstat (limited to 'dom/media/webm')
| -rw-r--r-- | dom/media/webm/WebMDecoder.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/dom/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp index 37e1e4a33..5cb943742 100644 --- a/dom/media/webm/WebMDecoder.cpp +++ b/dom/media/webm/WebMDecoder.cpp @@ -41,8 +41,11 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs, } const bool isWebMAudio = aMIMETypeExcludingCodecs.EqualsASCII("audio/webm"); - const bool isWebMVideo = aMIMETypeExcludingCodecs.EqualsASCII("video/webm") || aMIMETypeExcludingCodecs.EqualsASCII("video/x-matroska") ; - if (!isWebMAudio && !isWebMVideo) { + const bool isWebMVideo = aMIMETypeExcludingCodecs.EqualsASCII("video/webm"); + const bool isMatroskaAudio = aMIMETypeExcludingCodecs.EqualsASCII("audio/x-matroska") ; + const bool isMatroskaVideo = aMIMETypeExcludingCodecs.EqualsASCII("video/x-matroska") ; + + if (!isWebMAudio && !isWebMVideo && !isMatroskaAudio && !isMatroskaVideo) { return false; } @@ -63,7 +66,7 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs, } // Note: Only accept VP8/VP9 in a video content type, not in an audio // content type. - if (isWebMVideo && + if ((isWebMVideo || isMatroskaVideo) && (codec.EqualsLiteral("vp8") || codec.EqualsLiteral("vp8.0") || codec.EqualsLiteral("vp9") || codec.EqualsLiteral("vp9.0"))) { |