Backed out changeset 8b17cd283110 (bug 1184867)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 30 Jul 2015 15:47:55 +0200
changeset 287127 c1bf2e8f78aa153a46cbccd177870c3676a31130
parent 287126 d61ae75fd242eb85312848cbc44267f59bfcd1d5
child 287128 ea0bf76ee44e3998347bde4378cc0c8b8fbcbe95
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1184867
milestone42.0a1
backs out8b17cd28311083d110b5d2d5da5401295d3f9e32
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
Backed out changeset 8b17cd283110 (bug 1184867)
dom/media/mediasource/TrackBuffersManager.cpp
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -8,20 +8,16 @@
 #include "ContainerParser.h"
 #include "MediaSourceDemuxer.h"
 #include "MediaSourceUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StateMirroring.h"
 #include "SourceBufferResource.h"
 #include "SourceBuffer.h"
 
-#ifdef MOZ_WEBM
-#include "WebMDemuxer.h"
-#endif
-
 #ifdef MOZ_FMP4
 #include "MP4Demuxer.h"
 #endif
 
 #include <limits>
 
 extern PRLogModuleInfo* GetMediaSourceLog();
 
@@ -759,22 +755,21 @@ TrackBuffersManager::ShutdownDemuxers()
   mInputDemuxer = nullptr;
 }
 
 void
 TrackBuffersManager::CreateDemuxerforMIMEType()
 {
   ShutdownDemuxers();
 
-#ifdef MOZ_WEBM
   if (mType.LowerCaseEqualsLiteral("video/webm") || mType.LowerCaseEqualsLiteral("audio/webm")) {
-    mInputDemuxer = new WebMDemuxer(mCurrentInputBuffer);
+    NS_WARNING("Waiting on WebMDemuxer");
+  // mInputDemuxer = new WebMDemuxer(mCurrentInputBuffer);
     return;
   }
-#endif
 
 #ifdef MOZ_FMP4
   if (mType.LowerCaseEqualsLiteral("video/mp4") || mType.LowerCaseEqualsLiteral("audio/mp4")) {
     mInputDemuxer = new MP4Demuxer(mCurrentInputBuffer);
     return;
   }
 #endif
   NS_WARNING("Not supported (yet)");