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

Bug 1163497. Part 3 - move stream connection code from MediaDecoder::RecreateDecodedStream() to DecodedStream::RecreateData(). r=roc.

Browse Source
This commit is contained in:
JW Wang 2015-05-26 10:21:41 +08:00
parent c87ee2d488
commit 86430c011e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/media/DecodedStream.cpp
View File

@ -231,7 +231,18 @@ DecodedStream::RecreateData(int64_t aInitialTime, SourceMediaStream* aStream)
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
GetReentrantMonitor().AssertCurrentThreadIn(); GetReentrantMonitor().AssertCurrentThreadIn();
MOZ_ASSERT(!mData); MOZ_ASSERT(!mData);
mData.reset(new DecodedStreamData(aInitialTime, aStream)); mData.reset(new DecodedStreamData(aInitialTime, aStream));
// Note that the delay between removing ports in DestroyDecodedStream
// and adding new ones won't cause a glitch since all graph operations
// between main-thread stable states take effect atomically.
auto& outputStreams = OutputStreams();
for (int32_t i = outputStreams.Length() - 1; i >= 0; --i) {
OutputStreamData& os = outputStreams[i];
MOZ_ASSERT(!os.mStream->IsDestroyed(), "Should've been removed in DestroyData()");
Connect(&os);
}
} }
nsTArray<OutputStreamData>& nsTArray<OutputStreamData>&

10
dom/media/MediaDecoder.cpp
View File

@ -339,16 +339,6 @@ void MediaDecoder::RecreateDecodedStream(int64_t aStartTimeUSecs,
mDecodedStream.DestroyData(); mDecodedStream.DestroyData();
mDecodedStream.RecreateData(aStartTimeUSecs, aGraph->CreateSourceStream(nullptr)); mDecodedStream.RecreateData(aStartTimeUSecs, aGraph->CreateSourceStream(nullptr));
// Note that the delay between removing ports in DestroyDecodedStream
// and adding new ones won't cause a glitch since all graph operations
// between main-thread stable states take effect atomically.
auto& outputStreams = OutputStreams();
for (int32_t i = outputStreams.Length() - 1; i >= 0; --i) {
OutputStreamData& os = outputStreams[i];
MOZ_ASSERT(!os.mStream->IsDestroyed(),
"Should've been removed in DestroyDecodedStream()");
mDecodedStream.Connect(&os);
}
UpdateStreamBlockingForStateMachinePlaying(); UpdateStreamBlockingForStateMachinePlaying();
GetDecodedStream()->mHaveBlockedForPlayState = mPlayState != PLAY_STATE_PLAYING; GetDecodedStream()->mHaveBlockedForPlayState = mPlayState != PLAY_STATE_PLAYING;