Bug 1240411: P2. Clean up webrtc headers. r=jesup

Remove redundant virtual keyword and add missing override if any.
2016-01-18 14:25:30 +11:00 · 2016-01-18 14:25:30 +11:00 · 9b530d4a1e
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.h
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.h
@ -34,10 +34,10 @@ public:
  {}


-  virtual void GetName(nsAString& aName) override;
-  virtual void GetUUID(nsACString& aUUID) override;
-  virtual void SetDirectListeners(bool aHasListeners) override;
-  virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
+  void GetName(nsAString& aName) override;
+  void GetUUID(nsACString& aUUID) override;
+  void SetDirectListeners(bool aHasListeners) override;
+  nsresult Config(bool aEchoOn, uint32_t aEcho,
                  bool aAgcOn, uint32_t aAGC,
                  bool aNoiseOn, uint32_t aNoise,
                  int32_t aPlayoutDelay) override
@ -45,12 +45,12 @@ public:
    return NS_OK;
  };

-  virtual bool IsFake() override
+  bool IsFake() override
  {
    return false;
  }

-  virtual nsresult TakePhoto(PhotoCallback* aCallback) override
+  nsresult TakePhoto(PhotoCallback* aCallback) override
  {
    return NS_ERROR_NOT_IMPLEMENTED;
  }
@ -59,7 +59,7 @@ public:
      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets,
      const nsString& aDeviceId) override;

-  virtual void Shutdown() override {};
+  void Shutdown() override {};

 protected:
  struct CapabilityCandidate {
@ -85,7 +85,7 @@ protected:
  static void TrimLessFitCandidates(CapabilitySet& set);
  static void LogConstraints(const dom::MediaTrackConstraintSet& aConstraints,
                             bool aAdvanced);
-static void LogCapability(const char* aHeader,
+  static void LogCapability(const char* aHeader,
                            const webrtc::CaptureCapability &aCapability,
                            uint32_t aDistance);
  virtual size_t NumCapabilities();
--- a/dom/media/webrtc/MediaEngineDefault.h
+++ b/dom/media/webrtc/MediaEngineDefault.h
@ -38,42 +38,42 @@ class MediaEngineDefaultVideoSource : public nsITimerCallback,
 public:
  MediaEngineDefaultVideoSource();

-  virtual void Shutdown() override {};
+  void Shutdown() override {};

-  virtual void GetName(nsAString&) override;
-  virtual void GetUUID(nsACString&) override;
+  void GetName(nsAString&) override;
+  void GetUUID(nsACString&) override;

-  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
+  nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                    const MediaEnginePrefs &aPrefs,
                    const nsString& aDeviceId) override;
-  virtual nsresult Deallocate() override;
-  virtual nsresult Start(SourceMediaStream*, TrackID) override;
-  virtual nsresult Stop(SourceMediaStream*, TrackID) override;
-  virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Deallocate() override;
+  nsresult Start(SourceMediaStream*, TrackID) override;
+  nsresult Stop(SourceMediaStream*, TrackID) override;
+  nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                   const MediaEnginePrefs &aPrefs,
                   const nsString& aDeviceId) override;
-  virtual void SetDirectListeners(bool aHasDirectListeners) override {};
-  virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
+  void SetDirectListeners(bool aHasDirectListeners) override {};
+  nsresult Config(bool aEchoOn, uint32_t aEcho,
                  bool aAgcOn, uint32_t aAGC,
                  bool aNoiseOn, uint32_t aNoise,
                  int32_t aPlayoutDelay) override { return NS_OK; };
-  virtual void NotifyPull(MediaStreamGraph* aGraph,
+  void NotifyPull(MediaStreamGraph* aGraph,
                  SourceMediaStream *aSource,
                  TrackID aId,
                  StreamTime aDesiredTime) override;
-  virtual uint32_t GetBestFitnessDistance(
+  uint32_t GetBestFitnessDistance(
      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets,
      const nsString& aDeviceId) override;

-  virtual bool IsFake() override {
+  bool IsFake() override {
    return true;
  }

-  virtual dom::MediaSourceEnum GetMediaSource() const override {
+  dom::MediaSourceEnum GetMediaSource() const override {
    return dom::MediaSourceEnum::Camera;
  }

-  virtual nsresult TakePhoto(PhotoCallback* aCallback) override
+  nsresult TakePhoto(PhotoCallback* aCallback) override
  {
    return NS_ERROR_NOT_IMPLEMENTED;
  }
@ -111,27 +111,27 @@ class MediaEngineDefaultAudioSource : public nsITimerCallback,
 public:
  MediaEngineDefaultAudioSource();

-  virtual void Shutdown() override {};
+  void Shutdown() override {};

-  virtual void GetName(nsAString&) override;
-  virtual void GetUUID(nsACString&) override;
+  void GetName(nsAString&) override;
+  void GetUUID(nsACString&) override;

-  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
+  nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                    const MediaEnginePrefs &aPrefs,
                    const nsString& aDeviceId) override;
-  virtual nsresult Deallocate() override;
-  virtual nsresult Start(SourceMediaStream*, TrackID) override;
-  virtual nsresult Stop(SourceMediaStream*, TrackID) override;
-  virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Deallocate() override;
+  nsresult Start(SourceMediaStream*, TrackID) override;
+  nsresult Stop(SourceMediaStream*, TrackID) override;
+  nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                   const MediaEnginePrefs &aPrefs,
                   const nsString& aDeviceId) override;
-  virtual void SetDirectListeners(bool aHasDirectListeners) override {};
-  virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
+  void SetDirectListeners(bool aHasDirectListeners) override {};
+  nsresult Config(bool aEchoOn, uint32_t aEcho,
                  bool aAgcOn, uint32_t aAGC,
                  bool aNoiseOn, uint32_t aNoise,
                  int32_t aPlayoutDelay) override { return NS_OK; };
  void AppendToSegment(AudioSegment& aSegment, TrackTicks aSamples);
-  virtual void NotifyPull(MediaStreamGraph* aGraph,
+  void NotifyPull(MediaStreamGraph* aGraph,
                  SourceMediaStream *aSource,
                  TrackID aId,
                  StreamTime aDesiredTime) override
@ -144,20 +144,20 @@ public:
 #endif
  }

-  virtual bool IsFake() override {
+  bool IsFake() override {
    return true;
  }

-  virtual dom::MediaSourceEnum GetMediaSource() const override {
+  dom::MediaSourceEnum GetMediaSource() const override {
    return dom::MediaSourceEnum::Microphone;
  }

-  virtual nsresult TakePhoto(PhotoCallback* aCallback) override
+  nsresult TakePhoto(PhotoCallback* aCallback) override
  {
    return NS_ERROR_NOT_IMPLEMENTED;
  }

-  virtual uint32_t GetBestFitnessDistance(
+  uint32_t GetBestFitnessDistance(
      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets,
      const nsString& aDeviceId) override;

@ -186,11 +186,11 @@ public:
    , mMutex("mozilla::MediaEngineDefault")
  {}

-  virtual void EnumerateVideoDevices(dom::MediaSourceEnum,
+  void EnumerateVideoDevices(dom::MediaSourceEnum,
                             nsTArray<RefPtr<MediaEngineVideoSource> >*) override;
-  virtual void EnumerateAudioDevices(dom::MediaSourceEnum,
+  void EnumerateAudioDevices(dom::MediaSourceEnum,
                             nsTArray<RefPtr<MediaEngineAudioSource> >*) override;
-  virtual void Shutdown() override {
+  void Shutdown() override {
    MutexAutoLock lock(mMutex);

    mVSources.Clear();
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.h
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.h
@ -60,20 +60,20 @@ public:
      Init();
    }

-  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
+  nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                    const MediaEnginePrefs &aPrefs,
                    const nsString& aDeviceId) override;
-  virtual nsresult Deallocate() override;
-  virtual nsresult Start(SourceMediaStream* aStream, TrackID aID) override;
-  virtual nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
-  virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Deallocate() override;
+  nsresult Start(SourceMediaStream* aStream, TrackID aID) override;
+  nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
+  nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                   const MediaEnginePrefs &aPrefs,
                   const nsString& aDeviceId) override;
-  virtual void NotifyPull(MediaStreamGraph* aGraph,
+  void NotifyPull(MediaStreamGraph* aGraph,
                  SourceMediaStream* aSource,
                  TrackID aId,
                  StreamTime aDesiredTime) override;
-  virtual dom::MediaSourceEnum GetMediaSource() const override {
+  dom::MediaSourceEnum GetMediaSource() const override {
    return dom::MediaSourceEnum::Camera;
  }

--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.h
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.h
@ -54,37 +54,37 @@ public:
  NS_DECL_THREADSAFE_ISUPPORTS

  // ExternalRenderer
-  virtual int FrameSizeChange(unsigned int w, unsigned int h,
+  int FrameSizeChange(unsigned int w, unsigned int h,
                      unsigned int streams) override;
-  virtual int DeliverFrame(unsigned char* buffer,
+  int DeliverFrame(unsigned char* buffer,
                   size_t size,
                   uint32_t time_stamp,
                   int64_t ntp_time,
                   int64_t render_time,
                   void *handle) override;
  // XXX!!!! FIX THIS
-  virtual int DeliverI420Frame(const webrtc::I420VideoFrame& webrtc_frame) override { return 0; };
-  virtual bool IsTextureSupported() override { return false; };
+  int DeliverI420Frame(const webrtc::I420VideoFrame& webrtc_frame) override { return 0; };
+  bool IsTextureSupported() override { return false; };

  // MediaEngineCameraVideoSource
  MediaEngineRemoteVideoSource(int aIndex, mozilla::camera::CaptureEngine aCapEngine,
                               dom::MediaSourceEnum aMediaSource,
                               const char* aMonitorName = "RemoteVideo.Monitor");

-  virtual nsresult Allocate(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Allocate(const dom::MediaTrackConstraints& aConstraints,
                    const MediaEnginePrefs& aPrefs,
                    const nsString& aDeviceId) override;
-  virtual nsresult Deallocate() override;;
-  virtual nsresult Start(SourceMediaStream*, TrackID) override;
-  virtual nsresult Stop(SourceMediaStream*, TrackID) override;
-  virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Deallocate() override;;
+  nsresult Start(SourceMediaStream*, TrackID) override;
+  nsresult Stop(SourceMediaStream*, TrackID) override;
+  nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                   const MediaEnginePrefs &aPrefs,
                   const nsString& aDeviceId) override;
-  virtual void NotifyPull(MediaStreamGraph* aGraph,
+  void NotifyPull(MediaStreamGraph* aGraph,
                  SourceMediaStream* aSource,
                  TrackID aId,
                  StreamTime aDesiredTime) override;
-  virtual dom::MediaSourceEnum GetMediaSource() const override {
+  dom::MediaSourceEnum GetMediaSource() const override {
    return mMediaSource;
  }

@ -94,7 +94,7 @@ public:

  void Refresh(int aIndex);

-  virtual void Shutdown() override;
+  void Shutdown() override;

 protected:
  ~MediaEngineRemoteVideoSource() { Shutdown(); }
--- a/dom/media/webrtc/MediaEngineTabVideoSource.h
+++ b/dom/media/webrtc/MediaEngineTabVideoSource.h
@ -18,33 +18,33 @@ class MediaEngineTabVideoSource : public MediaEngineVideoSource, nsIDOMEventList
    NS_DECL_NSITIMERCALLBACK
    MediaEngineTabVideoSource();

-    virtual void Shutdown() override {};
-    virtual void GetName(nsAString_internal&) override;
-    virtual void GetUUID(nsACString_internal&) override;
-    virtual nsresult Allocate(const dom::MediaTrackConstraints &,
+    void Shutdown() override {};
+    void GetName(nsAString_internal&) override;
+    void GetUUID(nsACString_internal&) override;
+    nsresult Allocate(const dom::MediaTrackConstraints &,
                      const mozilla::MediaEnginePrefs&,
                      const nsString& aDeviceId) override;
-    virtual nsresult Deallocate() override;
-    virtual nsresult Start(mozilla::SourceMediaStream*, mozilla::TrackID) override;
-    virtual void SetDirectListeners(bool aHasDirectListeners) override {};
-    virtual void NotifyPull(mozilla::MediaStreamGraph*, mozilla::SourceMediaStream*, mozilla::TrackID, mozilla::StreamTime) override;
-    virtual nsresult Stop(mozilla::SourceMediaStream*, mozilla::TrackID) override;
-    virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
+    nsresult Deallocate() override;
+    nsresult Start(mozilla::SourceMediaStream*, mozilla::TrackID) override;
+    void SetDirectListeners(bool aHasDirectListeners) override {};
+    void NotifyPull(mozilla::MediaStreamGraph*, mozilla::SourceMediaStream*, mozilla::TrackID, mozilla::StreamTime) override;
+    nsresult Stop(mozilla::SourceMediaStream*, mozilla::TrackID) override;
+    nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                     const mozilla::MediaEnginePrefs& aPrefs,
                     const nsString& aDeviceId) override;
-    virtual nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t) override;
-    virtual bool IsFake() override;
-    virtual dom::MediaSourceEnum GetMediaSource() const override {
+    nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t) override;
+    bool IsFake() override;
+    dom::MediaSourceEnum GetMediaSource() const override {
      return dom::MediaSourceEnum::Browser;
    }
-    virtual uint32_t GetBestFitnessDistance(
+    uint32_t GetBestFitnessDistance(
      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets,
      const nsString& aDeviceId) override
    {
      return 0;
    }

-    virtual nsresult TakePhoto(PhotoCallback* aCallback) override
+    nsresult TakePhoto(PhotoCallback* aCallback) override
    {
      return NS_ERROR_NOT_IMPLEMENTED;
    }
--- a/dom/media/webrtc/MediaEngineWebRTC.h
+++ b/dom/media/webrtc/MediaEngineWebRTC.h
@ -151,43 +151,43 @@ public:
    Init();
  }

-  virtual void GetName(nsAString& aName) override;
-  virtual void GetUUID(nsACString& aUUID) override;
+  void GetName(nsAString& aName) override;
+  void GetUUID(nsACString& aUUID) override;

-  virtual nsresult Allocate(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Allocate(const dom::MediaTrackConstraints& aConstraints,
                    const MediaEnginePrefs& aPrefs,
                    const nsString& aDeviceId) override;
-  virtual nsresult Deallocate() override;
-  virtual nsresult Start(SourceMediaStream* aStream, TrackID aID) override;
-  virtual nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
-  virtual nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
+  nsresult Deallocate() override;
+  nsresult Start(SourceMediaStream* aStream, TrackID aID) override;
+  nsresult Stop(SourceMediaStream* aSource, TrackID aID) override;
+  nsresult Restart(const dom::MediaTrackConstraints& aConstraints,
                   const MediaEnginePrefs &aPrefs,
                   const nsString& aDeviceId) override;
-  virtual void SetDirectListeners(bool aHasDirectListeners) override {};
-  virtual nsresult Config(bool aEchoOn, uint32_t aEcho,
+  void SetDirectListeners(bool aHasDirectListeners) override {};
+  nsresult Config(bool aEchoOn, uint32_t aEcho,
                  bool aAgcOn, uint32_t aAGC,
                  bool aNoiseOn, uint32_t aNoise,
                  int32_t aPlayoutDelay) override;

-  virtual void NotifyPull(MediaStreamGraph* aGraph,
+  void NotifyPull(MediaStreamGraph* aGraph,
                  SourceMediaStream* aSource,
                  TrackID aId,
                  StreamTime aDesiredTime) override;

-  virtual bool IsFake() override {
+  bool IsFake() override {
    return false;
  }

-  virtual dom::MediaSourceEnum GetMediaSource() const override {
+  dom::MediaSourceEnum GetMediaSource() const override {
    return dom::MediaSourceEnum::Microphone;
  }

-  virtual nsresult TakePhoto(PhotoCallback* aCallback) override
+  nsresult TakePhoto(PhotoCallback* aCallback) override
  {
    return NS_ERROR_NOT_IMPLEMENTED;
  }

-  virtual uint32_t GetBestFitnessDistance(
+  uint32_t GetBestFitnessDistance(
      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets,
      const nsString& aDeviceId) override;

@ -196,7 +196,7 @@ public:
               int16_t audio10ms[], int length,
               int samplingFreq, bool isStereo) override;

-  virtual void Shutdown() override;
+  void Shutdown() override;

  NS_DECL_THREADSAFE_ISUPPORTS

@ -247,9 +247,9 @@ public:
  // before invoking Shutdown on this class.
  void Shutdown() override;

-  virtual void EnumerateVideoDevices(dom::MediaSourceEnum,
+  void EnumerateVideoDevices(dom::MediaSourceEnum,
                             nsTArray<RefPtr<MediaEngineVideoSource>>*) override;
-  virtual void EnumerateAudioDevices(dom::MediaSourceEnum,
+  void EnumerateAudioDevices(dom::MediaSourceEnum,
                             nsTArray<RefPtr<MediaEngineAudioSource>>*) override;
 private:
  ~MediaEngineWebRTC() {