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 752784: protect against media not having a track of the required type r=roc

Browse Source
This commit is contained in:
Randell Jesup 2012-05-09 01:53:49 -04:00
parent 0f0dde188f
commit ebb8d15057
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/media/MediaStreamGraph.cpp
View File

@ -1815,7 +1815,12 @@ SourceMediaStream::AppendToTrack(TrackID aID, MediaSegment* aSegment)
{
{
MutexAutoLock lock(mMutex);
FindDataForTrack(aID)->mData->AppendFrom(aSegment);
TrackData *track = FindDataForTrack(aID);
if (track) {
track->mData->AppendFrom(aSegment);
} else {
NS_ERROR("Append to non-existant track!");
}
}
GraphImpl()->EnsureNextIteration();
}
@ -1824,7 +1829,12 @@ bool
SourceMediaStream::HaveEnoughBuffered(TrackID aID)
{
MutexAutoLock lock(mMutex);
return FindDataForTrack(aID)->mHaveEnough;
TrackData *track = FindDataForTrack(aID);
if (track) {
return track->mHaveEnough;
}
NS_ERROR("No track in HaveEnoughBuffered!");
return true;
}
void
@ -1833,6 +1843,11 @@ SourceMediaStream::DispatchWhenNotEnoughBuffered(TrackID aID,
{
MutexAutoLock lock(mMutex);
TrackData* data = FindDataForTrack(aID);
if (!data) {
NS_ERROR("No track in DispatchWhenNotEnoughBuffered");
return;
}
if (data->mHaveEnough) {
data->mDispatchWhenNotEnough.AppendElement()->Init(aSignalThread, aSignalRunnable);
} else {
@ -1845,7 +1860,12 @@ SourceMediaStream::EndTrack(TrackID aID)
{
{
MutexAutoLock lock(mMutex);
FindDataForTrack(aID)->mCommands |= TRACK_END;
TrackData *track = FindDataForTrack(aID);
if (track) {
track->mCommands |= TRACK_END;
} else {
NS_ERROR("End of non-existant track");
}
}
GraphImpl()->EnsureNextIteration();
}