summaryrefslogtreecommitdiffstats
path: root/dom/media
diff options
context:
space:
mode:
authorJeroen Vreeken <jeroen@vreeken.net>2019-07-18 11:00:46 +0200
committerJeroen Vreeken <jeroen@vreeken.net>2019-07-18 11:00:46 +0200
commit6b6aa59ffc97ac76b4429db38eedac8474f5fda7 (patch)
tree683de407619abacc91046e2071236df17f972958 /dom/media
parent31addeaac8841867008699478ef55e1c1b3d68a7 (diff)
downloadUXP-6b6aa59ffc97ac76b4429db38eedac8474f5fda7.tar
UXP-6b6aa59ffc97ac76b4429db38eedac8474f5fda7.tar.gz
UXP-6b6aa59ffc97ac76b4429db38eedac8474f5fda7.tar.lz
UXP-6b6aa59ffc97ac76b4429db38eedac8474f5fda7.tar.xz
UXP-6b6aa59ffc97ac76b4429db38eedac8474f5fda7.zip
Alow AAC audio codec data in matroska/webm streams.
Allow CRC32 elements in matroska cluster elements.
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;