Bug 1166183 - Back out the direct listener removal landed by mistake in bug 1141781. r=jesup, a=sledru
authorPaul Adenot <paul@paul.cx>
Thu, 21 May 2015 13:35:29 +0800
changeset 260563 9525d8723413
parent 260562 414d430012ee
child 260564 6ee39f753d19
push id822
push userryanvm@gmail.com
push date2015-05-25 19:46 +0000
treeherdermozilla-release@19b9ffda6e2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sledru
bugs1166183, 1141781
milestone38.0
Bug 1166183 - Back out the direct listener removal landed by mistake in bug 1141781. r=jesup, a=sledru
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -625,22 +625,22 @@ void MediaPipelineTransmit::AttachToTrac
 
   // TODO(ekr@rtfm.com): Check for errors
   MOZ_MTLOG(ML_DEBUG, "Attaching pipeline to stream "
             << static_cast<void *>(stream_) << " conduit type=" <<
             (conduit_->type() == MediaSessionConduit::AUDIO ?"audio":"video"));
 
   stream_->AddListener(listener_);
 
- // // Is this a gUM mediastream?  If so, also register the Listener directly with
- // // the SourceMediaStream that's attached to the TrackUnion so we can get direct
- // // unqueued (and not resampled) data
- // if (domstream_->AddDirectListener(listener_)) {
- //   listener_->direct_connect_ = true;
- // }
+ // Is this a gUM mediastream?  If so, also register the Listener directly with
+ // the SourceMediaStream that's attached to the TrackUnion so we can get direct
+ // unqueued (and not resampled) data
+ if (domstream_->AddDirectListener(listener_)) {
+   listener_->direct_connect_ = true;
+ }
 
 #ifndef MOZILLA_INTERNAL_API
   // this enables the unit tests that can't fiddle with principals and the like
   listener_->SetEnabled(true);
 #endif
 }
 
 #ifdef MOZILLA_INTERNAL_API