diff --git a/content/media/MediaRecorder.cpp b/content/media/MediaRecorder.cpp index aad4f297824d..f4a31b217a54 100644 --- a/content/media/MediaRecorder.cpp +++ b/content/media/MediaRecorder.cpp @@ -115,9 +115,6 @@ private: MediaRecorder::~MediaRecorder() { - if (mStreamPort) { - mStreamPort->Destroy(); - } if (mTrackUnionStream) { mTrackUnionStream->Destroy(); } @@ -195,7 +192,8 @@ MediaRecorder::Start(const Optional& aTimeSlice, ErrorResult& aResult) MOZ_ASSERT(mEncoder, "CreateEncoder failed"); mTrackUnionStream->SetAutofinish(true); - mStreamPort = mTrackUnionStream->AllocateInputPort(mStream->GetStream(), MediaInputPort::FLAG_BLOCK_OUTPUT); + nsRefPtr port = + mTrackUnionStream->AllocateInputPort(mStream->GetStream(), MediaInputPort::FLAG_BLOCK_OUTPUT); if (mEncoder) { mTrackUnionStream->AddListener(mEncoder); diff --git a/content/media/MediaRecorder.h b/content/media/MediaRecorder.h index 0a5e14217d86..85350ae33f76 100644 --- a/content/media/MediaRecorder.h +++ b/content/media/MediaRecorder.h @@ -110,8 +110,6 @@ protected: nsRefPtr mStream; // This media stream is used for notifying raw data to encoder and can be blocked. nsRefPtr mTrackUnionStream; - // This is used for destroing the inputport when destroy the mediaRecorder - nsRefPtr mStreamPort; // This object creates on start() and destroys in ~MediaRecorder. nsAutoPtr mEncodedBufferCache; // It specifies the container format as well as the audio and video capture formats. diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in index 188115a3c9c1..9d31f65bd7f2 100644 --- a/content/media/test/Makefile.in +++ b/content/media/test/Makefile.in @@ -116,7 +116,6 @@ MOCHITEST_FILES = \ test_video_to_canvas.html \ test_audiowrite.html \ test_mediarecorder_creation.html \ - test_mediarecorder_record_audiocontext.html \ test_mozHasAudio.html \ test_source_media.html \ test_autoplay_contentEditable.html \ diff --git a/content/media/test/test_mediarecorder_record_audiocontext.html b/content/media/test/test_mediarecorder_record_audiocontext.html deleted file mode 100644 index 80ca190d5071..000000000000 --- a/content/media/test/test_mediarecorder_record_audiocontext.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - Test MediaRecorder Record AudioContext - - - - - - - - - - diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp b/content/media/webaudio/MediaStreamAudioDestinationNode.cpp index c2e2b983200f..0c99d7002079 100644 --- a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp +++ b/content/media/webaudio/MediaStreamAudioDestinationNode.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MediaStreamAudioDestinationNode.h" -#include "nsIDocument.h" #include "mozilla/dom/AudioStreamTrack.h" #include "mozilla/dom/MediaStreamAudioDestinationNodeBinding.h" #include "AudioNodeEngine.h" @@ -74,11 +73,6 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* a MediaStreamDestinationEngine* engine = new MediaStreamDestinationEngine(this, tus); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM); mPort = tus->AllocateInputPort(mStream, 0); - - nsIDocument* doc = aContext->GetParentObject()->GetExtantDoc(); - if (doc) { - mDOMStream->CombineWithPrincipal(doc->NodePrincipal()); - } } void