Backed out changeset 36cedce0c8b3 (bug 1060311)
authorPaul Adenot <paul@paul.cx>
Fri, 29 Aug 2014 18:23:12 +0200
changeset 202374 e5558950266fb8a13a1588b766db7e8c260d6211
parent 202373 1badbbe5e9a32d70ea1bad8d5b63d1e2199aa30a
child 202375 979e8914ba48801ef0e750e8f673c5505dfa4c1f
push id48409
push userpaul@paul.cx
push dateFri, 29 Aug 2014 16:27:26 +0000
treeherdermozilla-inbound@979e8914ba48 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1060311
milestone34.0a1
backs out36cedce0c8b3e59e422368a49cc0fe8845e4e501
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 36cedce0c8b3 (bug 1060311)
content/media/MediaStreamGraph.cpp
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -503,20 +503,16 @@ MediaStreamGraphImpl::UpdateStreamOrder(
   for (uint32_t i = 0; i < mStreams.Length(); ++i) {
     MediaStream* stream = mStreams[i];
     stream->mIsConsumed = false;
     stream->mInBlockingSet = false;
     if (stream->AsSourceStream() &&
         stream->AsSourceStream()->NeedsMixing()) {
       shouldAEC = true;
     }
-    // If this is a AudioNodeStream, force a AudioCallbackDriver.
-    if (stream->AsAudioNodeStream()) {
-      audioTrackPresent = true;
-    }
     for (StreamBuffer::TrackIter tracks(stream->GetStreamBuffer(), MediaSegment::AUDIO);
          !tracks.IsEnded(); tracks.Next()) {
       audioTrackPresent = true;
     }
   }
 
   if (!audioTrackPresent &&
       CurrentDriver()->AsAudioCallbackDriver()) {