diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp index 1730f26c5c62..0328c856c15c 100644 --- a/dom/media/MediaStreamGraph.cpp +++ b/dom/media/MediaStreamGraph.cpp @@ -751,21 +751,6 @@ MediaStreamGraphImpl::AddBlockingRelatedStreamsToSet(nsTArray* aSt return; aStream->mInBlockingSet = true; aStreams->AppendElement(aStream); - for (uint32_t i = 0; i < aStream->mConsumers.Length(); ++i) { - MediaInputPort* port = aStream->mConsumers[i]; - if (port->mFlags & (MediaInputPort::FLAG_BLOCK_INPUT | MediaInputPort::FLAG_BLOCK_OUTPUT)) { - AddBlockingRelatedStreamsToSet(aStreams, port->mDest); - } - } - ProcessedMediaStream* ps = aStream->AsProcessedStream(); - if (ps) { - for (uint32_t i = 0; i < ps->mInputs.Length(); ++i) { - MediaInputPort* port = ps->mInputs[i]; - if (port->mFlags & (MediaInputPort::FLAG_BLOCK_INPUT | MediaInputPort::FLAG_BLOCK_OUTPUT)) { - AddBlockingRelatedStreamsToSet(aStreams, port->mSource); - } - } - } } void @@ -774,21 +759,6 @@ MediaStreamGraphImpl::MarkStreamBlocking(MediaStream* aStream) if (aStream->mBlockInThisPhase) return; aStream->mBlockInThisPhase = true; - for (uint32_t i = 0; i < aStream->mConsumers.Length(); ++i) { - MediaInputPort* port = aStream->mConsumers[i]; - if (port->mFlags & MediaInputPort::FLAG_BLOCK_OUTPUT) { - MarkStreamBlocking(port->mDest); - } - } - ProcessedMediaStream* ps = aStream->AsProcessedStream(); - if (ps) { - for (uint32_t i = 0; i < ps->mInputs.Length(); ++i) { - MediaInputPort* port = ps->mInputs[i]; - if (port->mFlags & MediaInputPort::FLAG_BLOCK_INPUT) { - MarkStreamBlocking(port->mSource); - } - } - } } void @@ -2792,7 +2762,7 @@ ProcessedMediaStream::AllocateInputPort(MediaStream* aStream, } nsRefPtr mPort; }; - nsRefPtr port = new MediaInputPort(aStream, this, 0, + nsRefPtr port = new MediaInputPort(aStream, this, aInputNumber, aOutputNumber); port->SetGraphImpl(GraphImpl()); GraphImpl()->AppendMessage(new Message(port)); diff --git a/dom/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h index a4b64b054036..d8a5b8a6c8b4 100644 --- a/dom/media/MediaStreamGraph.h +++ b/dom/media/MediaStreamGraph.h @@ -995,11 +995,9 @@ class MediaInputPort final private: // Do not call this constructor directly. Instead call aDest->AllocateInputPort. MediaInputPort(MediaStream* aSource, ProcessedMediaStream* aDest, - uint32_t aFlags, uint16_t aInputNumber, - uint16_t aOutputNumber) + uint16_t aInputNumber, uint16_t aOutputNumber) : mSource(aSource) , mDest(aDest) - , mFlags(aFlags) , mInputNumber(aInputNumber) , mOutputNumber(aOutputNumber) , mGraph(nullptr) @@ -1016,20 +1014,6 @@ private: public: NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaInputPort) - /** - * The FLAG_BLOCK_INPUT and FLAG_BLOCK_OUTPUT flags can be used to control - * exactly how the blocking statuses of the input and output streams affect - * each other. - */ - enum { - // When set, blocking on the output stream forces blocking on the input - // stream. - FLAG_BLOCK_INPUT = 0x01, - // When set, blocking on the input stream forces blocking on the output - // stream. - FLAG_BLOCK_OUTPUT = 0x02 - }; - // Called on graph manager thread // Do not call these from outside MediaStreamGraph.cpp! void Init(); @@ -1093,7 +1077,6 @@ private: // Never modified after Init() MediaStream* mSource; ProcessedMediaStream* mDest; - uint32_t mFlags; // The input and output numbers are optional, and are currently only used by // Web Audio. const uint16_t mInputNumber;