wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=1022945 null MediaStream::mGraph before removing stream from graph r=roc

Browse Source 
and use mGraph to test whether SourceMediaStreams are destroyed.

--HG--
extra : rebase_source : 03df9e7ab14ecd627dfeb333b79713a7b619f215
This commit is contained in:
Karl Tomlinson 2014-07-25 09:09:22 +12:00
parent c6e0643c5d
commit ccb63bd2ec
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
content/media/MediaStreamGraph.cpp
View File

@ -2037,8 +2037,6 @@ MediaStream::RemoveAllListenersImpl()
void
MediaStream::DestroyImpl()
{
RemoveAllListenersImpl();
for (int32_t i = mConsumers.Length() - 1; i >= 0; --i) {
mConsumers[i]->Disconnect();
}
@ -2046,6 +2044,7 @@ MediaStream::DestroyImpl()
mAudioOutputStreams[i].mStream->Shutdown();
}
mAudioOutputStreams.Clear();
mGraph = nullptr;
}
void
@ -2059,8 +2058,10 @@ MediaStream::Destroy()
Message(MediaStream* aStream) : ControlMessage(aStream) {}
virtual void Run()
{
mStream->RemoveAllListenersImpl();
auto graph = mStream->GraphImpl();
mStream->DestroyImpl();
mStream->GraphImpl()->RemoveStream(mStream);
graph->RemoveStream(mStream);
}
virtual void RunDuringShutdown()
{ Run(); }
@ -2341,10 +2342,9 @@ MediaStream::ApplyTrackDisabling(TrackID aTrackID, MediaSegment* aSegment, Media
void
SourceMediaStream::DestroyImpl()
{
{
MutexAutoLock lock(mMutex);
mDestroyed = true;
}
// Hold mMutex while mGraph is reset so that other threads holding mMutex
// can null-check know that the graph will not destroyed.
MutexAutoLock lock(mMutex);
MediaStream::DestroyImpl();
}
@ -2353,7 +2353,7 @@ SourceMediaStream::SetPullEnabled(bool aEnabled)
{
MutexAutoLock lock(mMutex);
mPullEnabled = aEnabled;
if (mPullEnabled && !mDestroyed) {
if (mPullEnabled && GraphImpl()) {
GraphImpl()->EnsureNextIteration();
}
}
@ -2373,8 +2373,8 @@ SourceMediaStream::AddTrack(TrackID aID, TrackRate aRate, TrackTicks aStart,
data->mCommands = TRACK_CREATE;
data->mData = aSegment;
data->mHaveEnough = false;
if (!mDestroyed) {
GraphImpl()->EnsureNextIteration();
if (auto graph = GraphImpl()) {
graph->EnsureNextIteration();
}
}
@ -2439,8 +2439,8 @@ SourceMediaStream::AppendToTrack(TrackID aID, MediaSegment* aSegment, MediaSegme
aSegment->Clear();
}
}
if (!mDestroyed) {
GraphImpl()->EnsureNextIteration();
if (auto graph = GraphImpl()) {
graph->EnsureNextIteration();
}
return appended;
}
@ -2538,8 +2538,8 @@ SourceMediaStream::EndTrack(TrackID aID)
track->mCommands |= TRACK_END;
}
}
if (!mDestroyed) {
GraphImpl()->EnsureNextIteration();
if (auto graph = GraphImpl()) {
graph->EnsureNextIteration();
}
}
@ -2549,8 +2549,8 @@ SourceMediaStream::AdvanceKnownTracksTime(StreamTime aKnownTime)
MutexAutoLock lock(mMutex);
MOZ_ASSERT(aKnownTime >= mUpdateKnownTracksTime);
mUpdateKnownTracksTime = aKnownTime;
if (!mDestroyed) {
GraphImpl()->EnsureNextIteration();
if (auto graph = GraphImpl()) {
graph->EnsureNextIteration();
}
}
@ -2559,8 +2559,8 @@ SourceMediaStream::FinishWithLockHeld()
{
mMutex.AssertCurrentThreadOwns();
mUpdateFinished = true;
if (!mDestroyed) {
GraphImpl()->EnsureNextIteration();
if (auto graph = GraphImpl()) {
graph->EnsureNextIteration();
}
}

5
content/media/MediaStreamGraph.h
View File

@ -677,7 +677,7 @@ protected:
bool mMainThreadFinished;
bool mMainThreadDestroyed;
// Our media stream graph
// Our media stream graph. null if destroyed on the graph thread.
MediaStreamGraphImpl* mGraph;
dom::AudioChannel mAudioChannelType;
@ -697,7 +697,7 @@ public:
mMutex("mozilla::media::SourceMediaStream"),
mUpdateKnownTracksTime(0),
mPullEnabled(false),
mUpdateFinished(false), mDestroyed(false)
mUpdateFinished(false)
{}
virtual SourceMediaStream* AsSourceStream() { return this; }
@ -876,7 +876,6 @@ protected:
nsTArray<nsRefPtr<MediaStreamDirectListener> > mDirectListeners;
bool mPullEnabled;
bool mUpdateFinished;
bool mDestroyed;
bool mNeedsMixing;
};