Bug 1404977 - Part 4 - Format a comment and remove an unused and now useless method. r?pehrsons draft
authorPaul Adenot <paul@paul.cx>
Mon, 30 Apr 2018 15:20:58 +0200
changeset 794144 6ed36f450bad9213f83d1e63bca2e5689cfd9e40
parent 794143 aa58a8be74ae33b11cf9ae462edb134d18a16cbd
child 794145 09d60c0932c4ad9bcb37db2d3a6a21851490acd0
push id109576
push userachronop@gmail.com
push dateFri, 11 May 2018 11:11:31 +0000
reviewerspehrsons
bugs1404977
milestone62.0a1
Bug 1404977 - Part 4 - Format a comment and remove an unused and now useless method. r?pehrsons MozReview-Commit-ID: 8RmYYeRZA0r
dom/media/webrtc/MediaEngineWebRTC.cpp
dom/media/webrtc/MediaEngineWebRTC.h
--- a/dom/media/webrtc/MediaEngineWebRTC.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTC.cpp
@@ -300,36 +300,31 @@ MediaEngineWebRTC::EnumerateMicrophoneDe
   }
 }
 
 void
 MediaEngineWebRTC::EnumerateDevices(uint64_t aWindowId,
                                     dom::MediaSourceEnum aMediaSource,
                                     nsTArray<RefPtr<MediaEngineSource> >* aSources)
 {
-  // We spawn threads to handle gUM runnables, so we must protect the member vars
+  // We spawn threads to handle gUM runnables, so we must protect the member
+  // vars
   MutexAutoLock lock(mMutex);
   if (MediaEngineSource::IsVideo(aMediaSource)) {
     EnumerateVideoDevices(aWindowId, aMediaSource, aSources);
   } else if (aMediaSource == dom::MediaSourceEnum::AudioCapture) {
     RefPtr<MediaEngineWebRTCAudioCaptureSource> audioCaptureSource =
       new MediaEngineWebRTCAudioCaptureSource(nullptr);
     aSources->AppendElement(audioCaptureSource);
   } else {
     MOZ_ASSERT(aMediaSource == dom::MediaSourceEnum::Microphone);
     EnumerateMicrophoneDevices(aWindowId, aSources);
   }
 }
 
-bool
-MediaEngineWebRTC::SupportsDuplex()
-{
-  return mFullDuplex;
-}
-
 void
 MediaEngineWebRTC::ReleaseResourcesForWindow(uint64_t aWindowId)
 {
   {
     nsRefPtrHashtable<nsStringHashKey, MediaEngineSource>*
       audioDevicesForThisWindow = mAudioSources.Get(aWindowId);
 
     if (audioDevicesForThisWindow) {
--- a/dom/media/webrtc/MediaEngineWebRTC.h
+++ b/dom/media/webrtc/MediaEngineWebRTC.h
@@ -438,37 +438,30 @@ public:
   explicit MediaEngineWebRTC(MediaEnginePrefs& aPrefs);
 
   virtual void SetFakeDeviceChangeEvents() override;
 
   // Clients should ensure to clean-up sources video/audio sources
   // before invoking Shutdown on this class.
   void Shutdown() override;
 
-  // Returns whether the host supports duplex audio stream.
-  bool SupportsDuplex();
-
   void EnumerateDevices(uint64_t aWindowId,
                         dom::MediaSourceEnum,
                         nsTArray<RefPtr<MediaEngineSource>>*) override;
   void ReleaseResourcesForWindow(uint64_t aWindowId) override;
 private:
-  ~MediaEngineWebRTC() = default;
   void EnumerateVideoDevices(uint64_t aWindowId,
                              dom::MediaSourceEnum,
                              nsTArray<RefPtr<MediaEngineSource>>*);
   void EnumerateMicrophoneDevices(uint64_t aWindowId,
                                   nsTArray<RefPtr<MediaEngineSource>>*);
 
-  nsCOMPtr<nsIThread> mThread;
-
   // gUM runnables can e.g. Enumerate from multiple threads
   Mutex mMutex;
   RefPtr<mozilla::CubebDeviceEnumerator> mEnumerator;
-  bool mFullDuplex;
   bool mDelayAgnostic;
   bool mExtendedFilter;
   bool mHasTabVideoSource;
 
   // Maps WindowID to a map of device uuid to their MediaEngineSource,
   // separately for audio and video.
   nsClassHashtable<nsUint64HashKey,
                     nsRefPtrHashtable<nsStringHashKey,