summaryrefslogtreecommitdiffstats
path: root/dom/media
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-11-19 11:48:48 +0100
committerGitHub <noreply@github.com>2018-11-19 11:48:48 +0100
commitf4908ce993e54f96876ec3abc2cd0192d4f1230c (patch)
tree392b573c24677c0b708e9bc19bf0ca73cf0a512b /dom/media
parent181e7572833e26696bd477fa34b6da2c2af7ca6f (diff)
parent56c26d86748eadb1292b141993a48bf035081346 (diff)
downloadUXP-f4908ce993e54f96876ec3abc2cd0192d4f1230c.tar
UXP-f4908ce993e54f96876ec3abc2cd0192d4f1230c.tar.gz
UXP-f4908ce993e54f96876ec3abc2cd0192d4f1230c.tar.lz
UXP-f4908ce993e54f96876ec3abc2cd0192d4f1230c.tar.xz
UXP-f4908ce993e54f96876ec3abc2cd0192d4f1230c.zip
Merge pull request #876 from trav90/add-av1-support
Add support for AV1 in MP4 container
Diffstat (limited to 'dom/media')
-rw-r--r--dom/media/fmp4/MP4Decoder.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/dom/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp
index fdd6f2c7e..25dd53f94 100644
--- a/dom/media/fmp4/MP4Decoder.cpp
+++ b/dom/media/fmp4/MP4Decoder.cpp
@@ -139,6 +139,14 @@ MP4Decoder::CanHandleMediaType(const MediaContentType& aType,
NS_LITERAL_CSTRING("audio/flac"), aType));
continue;
}
+#ifdef MOZ_AV1
+ if (IsAV1CodecString(codec)) {
+ trackInfos.AppendElement(
+ CreateTrackInfoWithMIMETypeAndContentTypeExtraParameters(
+ NS_LITERAL_CSTRING("video/av1"), aType));
+ continue;
+ }
+#endif
// Note: Only accept H.264 in a video content type, not in an audio
// content type.
if (IsWhitelistedH264Codec(codec) && isMP4Video) {