Bug 1201393. Remove usage of FLAG_BLOCK_* from OutputStreamData::Connect. r=jwwang
authorRobert O'Callahan <robert@ocallahan.org>
Wed, 19 Aug 2015 14:12:16 +1200
changeset 261209 05bae6d384d96a0a0dbd726e28015636810236b9
parent 261208 1b13dab24bd1a2694d30756a0daeca4c14525590
child 261210 75832092cd8d4ae16ef263b1e62c947db77bc241
push id64690
push userrocallahan@mozilla.com
push dateTue, 08 Sep 2015 04:29:49 +0000
treeherdermozilla-inbound@321303b7d428 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwwang
bugs1201393
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1201393. Remove usage of FLAG_BLOCK_* from OutputStreamData::Connect. r=jwwang We don't want to block stream decoding on the output MediaStream, or vice versa.
dom/media/mediasink/DecodedStream.cpp
--- a/dom/media/mediasink/DecodedStream.cpp
+++ b/dom/media/mediasink/DecodedStream.cpp
@@ -248,20 +248,17 @@ OutputStreamData::Init(OutputStreamManag
 
 void
 OutputStreamData::Connect(MediaStream* aStream)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!mPort, "Already connected?");
   MOZ_ASSERT(!mStream->IsDestroyed(), "Can't connect a destroyed stream.");
 
-  // The output stream must stay in sync with the input stream, so if
-  // either stream is blocked, we block the other.
-  mPort = mStream->AllocateInputPort(aStream,
-    MediaInputPort::FLAG_BLOCK_INPUT | MediaInputPort::FLAG_BLOCK_OUTPUT);
+  mPort = mStream->AllocateInputPort(aStream, 0);
   // Unblock the output stream now. The input stream is responsible for
   // controlling blocking from now on.
   mStream->ChangeExplicitBlockerCount(-1);
 }
 
 bool
 OutputStreamData::Disconnect()
 {