Bug 1269408: P8. Add debugging log. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Fri, 06 May 2016 15:56:47 +1000
changeset 364205 b5073a84782ace986e1e9cc58f866f21b4207f5e
parent 364204 d839ee5f7e64423eaef5236a1b9a0cda5a4201d0
child 364206 b6fb72ebc0ce72be554b1cfb5e14afc7a5dbc56a
push id17383
push userbmo:jyavenard@mozilla.com
push dateFri, 06 May 2016 06:16:15 +0000
reviewersgerald
bugs1269408
milestone49.0a1
Bug 1269408: P8. Add debugging log. r?gerald Almost everytime I had to debug the MFR, I had to print those details. MozReview-Commit-ID: GR0vZuKiqyd
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -1221,16 +1221,19 @@ MediaFormatReader::ReturnOutput(MediaDat
   auto& decoder = GetDecoderData(aTrack);
   MOZ_ASSERT(decoder.HasPromise());
   if (decoder.mDiscontinuity) {
     LOGV("Setting discontinuity flag");
     decoder.mDiscontinuity = false;
     aData->mDiscontinuity = true;
   }
 
+  LOG("Resolved data promise for %s [%lld, %lld]", TrackTypeToStr(aTrack),
+      aData->mTime, aData->GetEndTime());
+
   if (aTrack == TrackInfo::kAudioTrack) {
     if (aData->mType != MediaData::RAW_DATA) {
       AudioData* audioData = static_cast<AudioData*>(aData);
 
       if (audioData->mChannels != mInfo.mAudio.mChannels ||
           audioData->mRate != mInfo.mAudio.mRate) {
         LOG("change of audio format (rate:%d->%d). "
             "This is an unsupported configuration",
@@ -1248,17 +1251,16 @@ MediaFormatReader::ReturnOutput(MediaDat
         LOG("change of video display size (%dx%d->%dx%d)",
             mInfo.mVideo.mDisplay.width, mInfo.mVideo.mDisplay.height,
             videoData->mDisplay.width, videoData->mDisplay.height);
         mInfo.mVideo.mDisplay = videoData->mDisplay;
       }
     }
     mVideo.ResolvePromise(aData, __func__);
   }
-  LOG("Resolved data promise for %s", TrackTypeToStr(aTrack));
 }
 
 size_t
 MediaFormatReader::SizeOfVideoQueueInFrames()
 {
   return SizeOfQueue(TrackInfo::kVideoTrack);
 }
 
@@ -1713,16 +1715,18 @@ MediaFormatReader::NotifyDemuxer()
 {
   MOZ_ASSERT(OnTaskQueue());
 
   if (mShutdown || !mDemuxer ||
       (!mDemuxerInitDone && !mDemuxerInitRequest.Exists())) {
     return;
   }
 
+  LOGV("");
+
   mDemuxer->NotifyDataArrived();
 
   if (!mInitDone) {
     return;
   }
   if (HasVideo()) {
     mVideo.mReceivedNewData = true;
     ScheduleUpdate(TrackType::kVideoTrack);