Bug 1295296 - Ignore video tracks in MediaStreamAudioSourceNode. r?jesup draft
authorAndreas Pehrson <pehrsons@gmail.com>
Wed, 17 Aug 2016 14:26:47 +0200
changeset 403164 c7c4811647b3d34247385e82688a0cd705f522d5
parent 403163 d145743e99a1a1cca3e456f36b419a8f8fa666bf
child 528840 33658f9d6ce9d45fd4615edc6aa23d1514da0d10
push id26841
push userpehrsons@gmail.com
push dateFri, 19 Aug 2016 07:26:32 +0000
reviewersjesup
bugs1295296
milestone51.0a1
Bug 1295296 - Ignore video tracks in MediaStreamAudioSourceNode. r?jesup MozReview-Commit-ID: 1NeFS5wIpxC
dom/media/webaudio/MediaStreamAudioSourceNode.cpp
--- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
+++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
@@ -91,16 +91,18 @@ MediaStreamAudioSourceNode::~MediaStream
 {
   Destroy();
 }
 
 void
 MediaStreamAudioSourceNode::AttachToTrack(const RefPtr<MediaStreamTrack>& aTrack)
 {
   MOZ_ASSERT(!mInputTrack);
+  MOZ_ASSERT(aTrack->AsAudioStreamTrack());
+
   if (!mStream) {
     return;
   }
 
   mInputTrack = aTrack;
   ProcessedMediaStream* outputStream =
     static_cast<ProcessedMediaStream*>(mStream.get());
   mInputPort = mInputTrack->ForwardTrackContentsTo(outputStream);
@@ -143,16 +145,20 @@ MediaStreamAudioSourceNode::AttachToFirs
 
 void
 MediaStreamAudioSourceNode::NotifyTrackAdded(const RefPtr<MediaStreamTrack>& aTrack)
 {
   if (mInputTrack) {
     return;
   }
 
+  if (!aTrack->AsAudioStreamTrack()) {
+    return;
+  }
+
   AttachToTrack(aTrack);
 }
 
 void
 MediaStreamAudioSourceNode::NotifyTrackRemoved(const RefPtr<MediaStreamTrack>& aTrack)
 {
   if (aTrack != mInputTrack) {
     return;