diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-24 05:58:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 05:58:24 +0200 |
| commit | d1a35c3fa6a59f622becc328bf00eff98732dc53 (patch) | |
| tree | 6792772d3cb4e22e4bac907376ba17d3030bd008 /dom/media/webm/WebMDecoder.cpp | |
| parent | 81acc4099a515cc1b74ec2b0669aa85fe078aabc (diff) | |
| parent | 192199b03fa2e56d2728b0de1dbe4bedfc1edc50 (diff) | |
| download | UXP-d1a35c3fa6a59f622becc328bf00eff98732dc53.tar UXP-d1a35c3fa6a59f622becc328bf00eff98732dc53.tar.gz UXP-d1a35c3fa6a59f622becc328bf00eff98732dc53.tar.lz UXP-d1a35c3fa6a59f622becc328bf00eff98732dc53.tar.xz UXP-d1a35c3fa6a59f622becc328bf00eff98732dc53.zip | |
Merge pull request #850 from trav90/add-av1-support
Add initial support for AV1 video.
Diffstat (limited to 'dom/media/webm/WebMDecoder.cpp')
| -rw-r--r-- | dom/media/webm/WebMDecoder.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dom/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp index b41de6d40..9575d6e42 100644 --- a/dom/media/webm/WebMDecoder.cpp +++ b/dom/media/webm/WebMDecoder.cpp @@ -5,6 +5,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/Preferences.h" +#ifdef MOZ_AV1 +#include "AOMDecoder.h" +#endif +#include "MediaPrefs.h" #include "MediaDecoderStateMachine.h" #include "WebMDemuxer.h" #include "WebMDecoder.h" @@ -65,6 +69,11 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs, continue; } +#ifdef MOZ_AV1 + if (MediaPrefs::AV1Enabled() && IsAV1CodecString(codec)) { + continue; + } +#endif // Some unsupported codec. return false; } |