summaryrefslogtreecommitdiffstats
path: root/dom/media
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2019-07-18 17:34:26 +0000
committerGitHub <noreply@github.com>2019-07-18 17:34:26 +0000
commitbf2610c0cfc96327178a5d3d7121181c2f375f48 (patch)
treeeb35ad416173cc4aa88e90bb8ed235289e1dc7de /dom/media
parent7979df5512bef6e1a67fbcc390817128fd4e7743 (diff)
parentf820636a8300b44751750354a01be21895b4b536 (diff)
downloadUXP-bf2610c0cfc96327178a5d3d7121181c2f375f48.tar
UXP-bf2610c0cfc96327178a5d3d7121181c2f375f48.tar.gz
UXP-bf2610c0cfc96327178a5d3d7121181c2f375f48.tar.lz
UXP-bf2610c0cfc96327178a5d3d7121181c2f375f48.tar.xz
UXP-bf2610c0cfc96327178a5d3d7121181c2f375f48.zip
Merge pull request #1189 from JeroenVreeken/master
Add support for AAC audio in matroska/webm files
Diffstat (limited to 'dom/media')
-rw-r--r--dom/media/webm/WebMDecoder.cpp4
-rw-r--r--dom/media/webm/WebMDemuxer.cpp2
2 files changed, 6 insertions, 0 deletions
diff --git a/dom/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp
index 5cb943742..cbe9ffdb7 100644
--- a/dom/media/webm/WebMDecoder.cpp
+++ b/dom/media/webm/WebMDecoder.cpp
@@ -82,6 +82,10 @@ WebMDecoder::CanHandleMediaType(const nsACString& aMIMETypeExcludingCodecs,
continue;
}
+ if (IsAACCodecString(codec)) {
+ continue;
+ }
+
// Some unsupported codec.
return false;
}
diff --git a/dom/media/webm/WebMDemuxer.cpp b/dom/media/webm/WebMDemuxer.cpp
index 2b6d46186..84b4b506e 100644
--- a/dom/media/webm/WebMDemuxer.cpp
+++ b/dom/media/webm/WebMDemuxer.cpp
@@ -422,6 +422,8 @@ WebMDemuxer::ReadMetadata()
mInfo.mAudio.mMimeType = "audio/opus";
OpusDataDecoder::AppendCodecDelay(mInfo.mAudio.mCodecSpecificConfig,
media::TimeUnit::FromNanoseconds(params.codec_delay).ToMicroseconds());
+ } else if (mAudioCodec == NESTEGG_CODEC_AAC) {
+ mInfo.mAudio.mMimeType = "audio/mp4a-latm";
}
mSeekPreroll = params.seek_preroll;
mInfo.mAudio.mRate = params.rate;