Bug 1250934: Update some MediaStreamGraph logging r?padenot
MozReview-Commit-ID: AhVg58ZzC4f
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -99,17 +99,18 @@ void
MediaStreamGraphImpl::AddStreamGraphThread(MediaStream* aStream)
{
aStream->mBufferStartTime = mProcessedTime;
if (aStream->IsSuspended()) {
mSuspendedStreams.AppendElement(aStream);
STREAM_LOG(LogLevel::Debug, ("Adding media stream %p to the graph, in the suspended stream array", aStream));
} else {
mStreams.AppendElement(aStream);
- STREAM_LOG(LogLevel::Debug, ("Adding media stream %p to the graph", aStream));
+ STREAM_LOG(LogLevel::Debug, ("Adding media stream %p to graph %p, count %lu", aStream, this, mStreams.Length()));
+ LIFECYCLE_LOG("Adding media stream %p to graph %p, count %lu", aStream, this, mStreams.Length());
}
SetStreamOrderDirty();
}
void
MediaStreamGraphImpl::RemoveStreamGraphThread(MediaStream* aStream)
{
@@ -129,17 +130,20 @@ MediaStreamGraphImpl::RemoveStreamGraphT
SetStreamOrderDirty();
if (aStream->IsSuspended()) {
mSuspendedStreams.RemoveElement(aStream);
} else {
mStreams.RemoveElement(aStream);
}
- STREAM_LOG(LogLevel::Debug, ("Removed media stream %p from the graph", aStream));
+ STREAM_LOG(LogLevel::Debug, ("Removed media stream %p from graph %p, count %lu",
+ aStream, this, mStreams.Length()))
+ LIFECYCLE_LOG("Removed media stream %p from graph %p, count %lu",
+ aStream, this, mStreams.Length());
NS_RELEASE(aStream); // probably destroying it
}
void
MediaStreamGraphImpl::ExtractPendingInput(SourceMediaStream* aStream,
GraphTime aDesiredUpToTime,
bool* aEnsureNextIteration)
@@ -2392,16 +2396,17 @@ SourceMediaStream::SetPullEnabled(bool a
void
SourceMediaStream::AddTrackInternal(TrackID aID, TrackRate aRate, StreamTime aStart,
MediaSegment* aSegment, uint32_t aFlags)
{
MutexAutoLock lock(mMutex);
nsTArray<TrackData> *track_data = (aFlags & ADDTRACK_QUEUED) ?
&mPendingTracks : &mUpdateTracks;
TrackData* data = track_data->AppendElement();
+ LIFECYCLE_LOG("AddTrackInternal: %lu/%lu", mPendingTracks.Length(), mUpdateTracks.Length());
data->mID = aID;
data->mInputRate = aRate;
data->mResamplerChannelCount = 0;
data->mStart = aStart;
data->mEndOfFlushedData = aStart;
data->mCommands = TRACK_CREATE;
data->mData = aSegment;
if (!(aFlags & ADDTRACK_QUEUED) && GraphImpl()) {
@@ -2409,16 +2414,17 @@ SourceMediaStream::AddTrackInternal(Trac
}
}
void
SourceMediaStream::FinishAddTracks()
{
MutexAutoLock lock(mMutex);
mUpdateTracks.AppendElements(Move(mPendingTracks));
+ LIFECYCLE_LOG("FinishAddTracks: %lu/%lu", mPendingTracks.Length(), mUpdateTracks.Length());
if (GraphImpl()) {
GraphImpl()->EnsureNextIteration();
}
}
StreamBuffer::Track*
SourceMediaStream::FindTrack(TrackID aID)
{