Bug 1616875: Remove some unnecessary code. r=mjf

Differential Revision: https://phabricator.services.mozilla.com/D64238 --HG-- extra : moz-landing-system : lando
dothq · Mar 19, 2020 · 5b459b8 · 5b459b8
1 parent 72efb61
commit 5b459b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -2649,19 +2649,20 @@ void PeerConnectionImpl::RecordConduitTelemetry() {
     return;
   }
 
-  nsTArray<RefPtr<MediaPipelineReceive>> pipelines;
+  nsTArray<RefPtr<VideoSessionConduit>> conduits;
   for (const auto& transceiver : mMedia->GetTransceivers()) {
-    if (transceiver->IsValid()) {
-      pipelines.AppendElement(transceiver->GetReceivePipeline());
+    RefPtr<MediaSessionConduit> conduit = transceiver->GetConduit();
+    if (conduit) {
+      auto asVideo = conduit->AsVideoSessionConduit();
+      if (asVideo) {
+        conduits.AppendElement(asVideo.value());
+      }
     }
   }
 
-  mSTSThread->Dispatch(NS_NewRunnableFunction(__func__, [pipelines]() {
-    for (const auto& pipeline : pipelines) {
-      auto asVideo = pipeline->Conduit()->AsVideoSessionConduit();
-      if (asVideo) {
-        asVideo.value()->RecordTelemetry();
-      }
+  mSTSThread->Dispatch(NS_NewRunnableFunction(__func__, [conduits]() {
+    for (const auto& conduit : conduits) {
+      conduit->RecordTelemetry();
     }
   }));
 }

diff --git a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp
@@ -479,19 +479,6 @@ void TransceiverImpl::InsertDTMFTone(int tone, uint32_t duration) {
   conduit->InsertDTMFTone(0, tone, true, duration, 6);
 }
 
-bool TransceiverImpl::HasReceiveTrack(
-    const dom::MediaStreamTrack* aRecvTrack) const {
-  if (!mHaveStartedReceiving) {
-    return false;
-  }
-
-  if (!aRecvTrack) {
-    return true;
-  }
-
-  return mReceiveTrack == aRecvTrack;
-}
-
 JSObject* TransceiverImpl::WrapObject(JSContext* aCx,
                                       JS::Handle<JSObject*> aGivenProto) {
   return dom::TransceiverImpl_Binding::Wrap(aCx, this, aGivenProto);
@@ -503,10 +490,6 @@ RefPtr<MediaPipelineTransmit> TransceiverImpl::GetSendPipeline() {
   return mTransmitPipeline;
 }
 
-RefPtr<MediaPipelineReceive> TransceiverImpl::GetReceivePipeline() {
-  return mReceivePipeline;
-}
-
 static nsresult JsepCodecDescToAudioCodecConfig(
     const JsepCodecDescription& aCodec, UniquePtr<AudioCodecConfig>* aConfig) {
   MOZ_ASSERT(aCodec.mType == SdpMediaSection::kAudio);

diff --git a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.h b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.h
@@ -96,13 +96,9 @@ class TransceiverImpl : public nsISupports, public nsWrapperCache {
 
   void InsertDTMFTone(int tone, uint32_t duration);
 
-  bool HasReceiveTrack(const dom::MediaStreamTrack* aReceiveTrack) const;
-
   // TODO: These are for stats; try to find a cleaner way.
   RefPtr<MediaPipelineTransmit> GetSendPipeline();
 
-  RefPtr<MediaPipelineReceive> GetReceivePipeline();
-
   std::string GetTransportId() const {
     return mJsepTransceiver->mTransport.mTransportId;
   }