Bug 1396629 - P5. Show container type in debug info. r=cpearce
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 04 Sep 2017 22:47:36 +0200
changeset 428569 8061d34e7d21b79e8ac843ae999e1538e992c871
parent 428568 27586b1f736b8257ca3a569df2d0f86dd50bfc78
child 428570 ffbd69cdade3be5b4bfa1df47a930ecf3b5ea590
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1396629
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1396629 - P5. Show container type in debug info. r=cpearce MozReview-Commit-ID: 3olXuGeqqoS
dom/media/MediaDecoder.cpp
dom/media/mediasource/MediaSourceDecoder.cpp
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1555,16 +1555,18 @@ MediaDecoder::RequestDebugInfo()
     [str] () {
       return DebugInfoPromise::CreateAndResolve(str, __func__);
     });
 }
 
 void
 MediaDecoder::GetMozDebugReaderData(nsACString& aString)
 {
+  aString += nsPrintfCString("Container Type: %s\n",
+                             ContainerType().Type().AsString().get());
   if (mReader) {
     mReader->GetMozDebugReaderData(aString);
   }
 }
 
 void
 MediaDecoder::NotifyAudibleStateChanged()
 {
--- a/dom/media/mediasource/MediaSourceDecoder.cpp
+++ b/dom/media/mediasource/MediaSourceDecoder.cpp
@@ -250,16 +250,17 @@ MediaSourceDecoder::SetMediaSourceDurati
   } else {
     SetExplicitDuration(PositiveInfinity<double>());
   }
 }
 
 void
 MediaSourceDecoder::GetMozDebugReaderData(nsACString& aString)
 {
+  aString += NS_LITERAL_CSTRING("Container Type: MediaSource\n");
   if (mReader && mDemuxer) {
     mReader->GetMozDebugReaderData(aString);
     mDemuxer->GetMozDebugReaderData(aString);
   }
 }
 
 double
 MediaSourceDecoder::GetDuration()