зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1058452 - Use FakeMediaStreamGraph r=mikeh
This commit is contained in:
Родитель
8422b9238f
Коммит
24dff6c377
|
@ -1188,7 +1188,7 @@ public:
|
|||
* Should only be called during MediaStreamListener callbacks or during
|
||||
* ProcessedMediaStream::ProcessInput().
|
||||
*/
|
||||
void DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed<nsIRunnable> aRunnable)
|
||||
virtual void DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed<nsIRunnable> aRunnable)
|
||||
{
|
||||
*mPendingUpdateRunnables.AppendElement() = aRunnable;
|
||||
}
|
||||
|
|
|
@ -19,6 +19,13 @@ using namespace mozilla::dom;
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
void
|
||||
FakeMediaStreamGraph::DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed<nsIRunnable> aRunnable)
|
||||
{
|
||||
nsRefPtr<nsIRunnable> task = aRunnable;
|
||||
NS_DispatchToMainThread(task);
|
||||
}
|
||||
|
||||
CameraPreviewMediaStream::CameraPreviewMediaStream(DOMMediaStream* aWrapper)
|
||||
: MediaStream(aWrapper)
|
||||
, mMutex("mozilla::camera::CameraPreviewMediaStream")
|
||||
|
@ -27,6 +34,7 @@ CameraPreviewMediaStream::CameraPreviewMediaStream(DOMMediaStream* aWrapper)
|
|||
, mRateLimit(false)
|
||||
{
|
||||
SetGraphImpl(MediaStreamGraph::GetInstance());
|
||||
mFakeMediaStreamGraph = new FakeMediaStreamGraph();
|
||||
mIsConsumed = false;
|
||||
}
|
||||
|
||||
|
@ -55,11 +63,10 @@ CameraPreviewMediaStream::AddVideoOutput(VideoFrameContainer* aContainer)
|
|||
if (mVideoOutputs.Length() > 1) {
|
||||
return;
|
||||
}
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
mIsConsumed = true;
|
||||
for (uint32_t j = 0; j < mListeners.Length(); ++j) {
|
||||
MediaStreamListener* l = mListeners[j];
|
||||
l->NotifyConsumptionChanged(gm, MediaStreamListener::CONSUMED);
|
||||
l->NotifyConsumptionChanged(mFakeMediaStreamGraph, MediaStreamListener::CONSUMED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -72,11 +79,10 @@ CameraPreviewMediaStream::RemoveVideoOutput(VideoFrameContainer* aContainer)
|
|||
if (!mVideoOutputs.IsEmpty()) {
|
||||
return;
|
||||
}
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
mIsConsumed = false;
|
||||
for (uint32_t j = 0; j < mListeners.Length(); ++j) {
|
||||
MediaStreamListener* l = mListeners[j];
|
||||
l->NotifyConsumptionChanged(gm, MediaStreamListener::NOT_CONSUMED);
|
||||
l->NotifyConsumptionChanged(mFakeMediaStreamGraph, MediaStreamListener::NOT_CONSUMED);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -90,9 +96,9 @@ CameraPreviewMediaStream::AddListener(MediaStreamListener* aListener)
|
|||
{
|
||||
MutexAutoLock lock(mMutex);
|
||||
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
MediaStreamListener* listener = *mListeners.AppendElement() = aListener;
|
||||
listener->NotifyBlockingChanged(gm, MediaStreamListener::UNBLOCKED);
|
||||
listener->NotifyBlockingChanged(mFakeMediaStreamGraph, MediaStreamListener::UNBLOCKED);
|
||||
listener->NotifyHasCurrentData(mFakeMediaStreamGraph);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -100,10 +106,9 @@ CameraPreviewMediaStream::RemoveListener(MediaStreamListener* aListener)
|
|||
{
|
||||
MutexAutoLock lock(mMutex);
|
||||
|
||||
MediaStreamGraph* gm = MediaStreamGraph::GetInstance();
|
||||
nsRefPtr<MediaStreamListener> listener(aListener);
|
||||
mListeners.RemoveElement(aListener);
|
||||
listener->NotifyEvent(gm, MediaStreamListener::EVENT_REMOVED);
|
||||
listener->NotifyEvent(mFakeMediaStreamGraph, MediaStreamListener::EVENT_REMOVED);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -11,6 +11,23 @@
|
|||
|
||||
namespace mozilla {
|
||||
|
||||
class FakeMediaStreamGraph : public MediaStreamGraph
|
||||
{
|
||||
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FakeMediaStreamGraph)
|
||||
public:
|
||||
FakeMediaStreamGraph()
|
||||
: MediaStreamGraph()
|
||||
{
|
||||
}
|
||||
|
||||
virtual void
|
||||
DispatchToMainThreadAfterStreamStateUpdate(already_AddRefed<nsIRunnable> aRunnable) MOZ_OVERRIDE;
|
||||
|
||||
protected:
|
||||
~FakeMediaStreamGraph()
|
||||
{}
|
||||
};
|
||||
|
||||
/**
|
||||
* This is a stream for camera preview.
|
||||
*
|
||||
|
@ -50,6 +67,7 @@ protected:
|
|||
int32_t mInvalidatePending;
|
||||
uint32_t mDiscardedFrames;
|
||||
bool mRateLimit;
|
||||
nsRefPtr<FakeMediaStreamGraph> mFakeMediaStreamGraph;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче