Commit 39bffaa8 authored by Jean-Yves Avenard's avatar Jean-Yves Avenard
Browse files

Bug 1345898: P1. Add debugging info. r=gerald 

MozReview-Commit-ID: GkURaX9bCDZ

--HG--
extra : rebase_source : 116c1a305f8271f35d3cb2202dc382c33ccf08b9
parent a621256e

dom/media/MediaFormatReader.cpp

+23 −17
Original line number Diff line number Diff line
@@ -2389,9 +2389,9 @@ MediaFormatReader::Update(TrackType aTrack) 


  bool needInput = NeedInput(decoder);



  LOGV(

    "Update(%s) ni=%d no=%d in:%" PRIu64 " out:%" PRIu64

    " qs=%u decoding:%d flushing:%d desc:%s pending:%u waiting:%d sid:%u",

  LOGV("Update(%s) ni=%d no=%d in:%" PRIu64 " out:%" PRIu64

       " qs=%u decoding:%d flushing:%d desc:%s pending:%u waiting:%d eos:%d "

       "ds:%d sid:%u",

       TrackTypeToStr(aTrack),

       needInput,

       needOutput,
@@ -2403,6 +2403,8 @@ MediaFormatReader::Update(TrackType aTrack) 
       decoder.mDescription,

       uint32_t(decoder.mOutput.Length()),

       decoder.mWaitingForData,

       decoder.mDemuxEOS,

       int32_t(decoder.mDrainState),

       decoder.mLastStreamSourceID);



  if ((decoder.mWaitingForData
@@ -3073,7 +3075,7 @@ MediaFormatReader::GetMozDebugReaderData(nsACString& aString) 
    result += nsPrintfCString(

      "Audio State: ni=%d no=%d wp=%d demuxr=%d demuxq=%u decoder=%d tt=%.1f "

      "tths=%d in=%" PRIu64 " out=%" PRIu64

      " qs=%u pending=%u wfd=%d wfk=%d sid=%u\n",

      " qs=%u pending=%u wfd=%d eos=%d ds=%d wfk=%d sid=%u\n",

      NeedInput(mAudio),

      mAudio.HasPromise(),

      !mAudio.mWaitingPromise.IsEmpty(),
@@ -3088,6 +3090,8 @@ MediaFormatReader::GetMozDebugReaderData(nsACString& aString) 
      unsigned(size_t(mAudio.mSizeOfQueue)),

      unsigned(mAudio.mOutput.Length()),

      mAudio.mWaitingForData,

      mAudio.mDemuxEOS,

      int32_t(mAudio.mDrainState),

      mAudio.mWaitingForKey,

      mAudio.mLastStreamSourceID);

  }
@@ -3103,7 +3107,7 @@ MediaFormatReader::GetMozDebugReaderData(nsACString& aString) 
    result += nsPrintfCString(

      "Video State: ni=%d no=%d wp=%d demuxr=%d demuxq=%u decoder=%d tt=%.1f "

      "tths=%d in=%" PRIu64 " out=%" PRIu64

      " qs=%u pending:%u wfd=%d wfk=%d sid=%u\n",

      " qs=%u pending:%u wfd=%d eos=%d ds=%d wfk=%d sid=%u\n",

      NeedInput(mVideo),

      mVideo.HasPromise(),

      !mVideo.mWaitingPromise.IsEmpty(),
@@ -3118,6 +3122,8 @@ MediaFormatReader::GetMozDebugReaderData(nsACString& aString) 
      unsigned(size_t(mVideo.mSizeOfQueue)),

      unsigned(mVideo.mOutput.Length()),

      mVideo.mWaitingForData,

      mVideo.mDemuxEOS,

      int32_t(mVideo.mDrainState),

      mVideo.mWaitingForKey,

      mVideo.mLastStreamSourceID);

  }