Bug 1412212. P2 - compact the output of GetDebugInfo(). r=JamesCheng

MozReview-Commit-ID: 6cAedI4Ax5r

--HG--
extra : rebase_source : d4162dace6c443fa993863c138855b19c33d7b59

dom/media/MediaDecoder.cpp

@@ -1521,11 +1521,14 @@ nsCString
 MediaDecoder::GetDebugInfo()
 {
   return nsPrintfCString(
-    "MediaDecoder State: channels=%u rate=%u hasAudio=%d hasVideo=%d "
+    "MediaDecoder=%p: channels=%u rate=%u hasAudio=%d hasVideo=%d "
-    "mPlayState=%s mdsm=%p",
+    "mPlayState=%s",
-    mInfo ? mInfo->mAudio.mChannels : 0, mInfo ? mInfo->mAudio.mRate : 0,
+    this,
-    mInfo ? mInfo->HasAudio() : 0, mInfo ? mInfo->HasVideo() : 0,
+    mInfo ? mInfo->mAudio.mChannels : 0,
-    PlayStateStr(), GetStateMachine());
+    mInfo ? mInfo->mAudio.mRate : 0,
+    mInfo ? mInfo->HasAudio() : 0,
+    mInfo ? mInfo->HasVideo() : 0,
+    PlayStateStr());
 }
 
 void

dom/media/MediaDecoderStateMachine.cpp

@@ -3697,8 +3697,7 @@ MediaDecoderStateMachine::GetDebugInfo()
   int64_t duration =
     mDuration.Ref() ? mDuration.Ref().ref().ToMicroseconds() : -1;
   auto str = nsPrintfCString(
-    "MediaDecoderStateMachine State: duration=%" PRId64 " GetMediaTime=%" PRId64
+    "MDSM: duration=%" PRId64 " GetMediaTime=%" PRId64 " GetClock="
-    " GetClock="
     "%" PRId64 " mMediaSink=%p state=%s mPlayState=%d "
     "mSentFirstFrameLoadedEvent=%d IsPlaying=%d mAudioStatus=%s "
     "mVideoStatus=%s mDecodedAudioEndTime=%" PRId64

dom/media/mediasink/VideoSink.cpp

@@ -509,7 +509,7 @@ VideoSink::GetDebugInfo()
 {
   AssertOwnerThread();
   auto str = nsPrintfCString(
-    "VideoSink Status: IsStarted=%d IsPlaying=%d VideoQueue(finished=%d "
+    "VideoSink: IsStarted=%d IsPlaying=%d VideoQueue(finished=%d "
     "size=%zu) mVideoFrameEndTime=%" PRId64 " mHasVideo=%d "
     "mVideoSinkEndRequest.Exists()=%d mEndPromiseHolder.IsEmpty()=%d",
     IsStarted(),