From 08c9a793eb00635bb2daf16c998c2121e76f6a27 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Mon, 7 Apr 2014 15:37:51 -0400 Subject: [PATCH] Backed out changeset 74e5c32c6fa2 (bug 694814) --- content/media/webrtc/MediaEngine.h | 3 +-- content/media/webrtc/MediaEngineDefault.h | 6 ++---- content/media/webrtc/MediaEngineTabVideoSource.cpp | 2 +- content/media/webrtc/MediaEngineTabVideoSource.h | 2 +- content/media/webrtc/MediaEngineWebRTC.h | 8 ++------ content/media/webrtc/MediaEngineWebRTCAudio.cpp | 4 +--- dom/media/MediaManager.cpp | 5 +---- dom/media/MediaManager.h | 5 ++--- 8 files changed, 11 insertions(+), 24 deletions(-) diff --git a/content/media/webrtc/MediaEngine.h b/content/media/webrtc/MediaEngine.h index bb3f2ccbf134..28d766654459 100644 --- a/content/media/webrtc/MediaEngine.h +++ b/content/media/webrtc/MediaEngine.h @@ -101,8 +101,7 @@ public: /* Change device configuration. */ virtual nsresult Config(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay) = 0; + bool aNoiseOn, uint32_t aNoise) = 0; /* Returns true if a source represents a fake capture device and * false otherwise diff --git a/content/media/webrtc/MediaEngineDefault.h b/content/media/webrtc/MediaEngineDefault.h index 16ff49c213ca..ef19c6ad0099 100644 --- a/content/media/webrtc/MediaEngineDefault.h +++ b/content/media/webrtc/MediaEngineDefault.h @@ -48,8 +48,7 @@ public: virtual nsresult Snapshot(uint32_t aDuration, nsIDOMFile** aFile); virtual nsresult Config(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay) { return NS_OK; }; + bool aNoiseOn, uint32_t aNoise) { return NS_OK; }; virtual void NotifyPull(MediaStreamGraph* aGraph, SourceMediaStream *aSource, TrackID aId, @@ -101,8 +100,7 @@ public: virtual nsresult Snapshot(uint32_t aDuration, nsIDOMFile** aFile); virtual nsresult Config(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay) { return NS_OK; }; + bool aNoiseOn, uint32_t aNoise) { return NS_OK; }; virtual void NotifyPull(MediaStreamGraph* aGraph, SourceMediaStream *aSource, TrackID aId, diff --git a/content/media/webrtc/MediaEngineTabVideoSource.cpp b/content/media/webrtc/MediaEngineTabVideoSource.cpp index 917548b48156..c749db7708fc 100644 --- a/content/media/webrtc/MediaEngineTabVideoSource.cpp +++ b/content/media/webrtc/MediaEngineTabVideoSource.cpp @@ -279,7 +279,7 @@ MediaEngineTabVideoSource::Stop(mozilla::SourceMediaStream*, mozilla::TrackID) } nsresult -MediaEngineTabVideoSource::Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t) +MediaEngineTabVideoSource::Config(bool, uint32_t, bool, uint32_t, bool, uint32_t) { return NS_OK; } diff --git a/content/media/webrtc/MediaEngineTabVideoSource.h b/content/media/webrtc/MediaEngineTabVideoSource.h index 9bf8c177f3b4..058b47dec46a 100644 --- a/content/media/webrtc/MediaEngineTabVideoSource.h +++ b/content/media/webrtc/MediaEngineTabVideoSource.h @@ -26,7 +26,7 @@ class MediaEngineTabVideoSource : public MediaEngineVideoSource, nsIDOMEventList virtual nsresult Snapshot(uint32_t, nsIDOMFile**); virtual void NotifyPull(mozilla::MediaStreamGraph*, mozilla::SourceMediaStream*, mozilla::TrackID, mozilla::StreamTime, mozilla::TrackTicks&); virtual nsresult Stop(mozilla::SourceMediaStream*, mozilla::TrackID); - virtual nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t, int32_t); + virtual nsresult Config(bool, uint32_t, bool, uint32_t, bool, uint32_t); virtual bool IsFake(); void Draw(); diff --git a/content/media/webrtc/MediaEngineWebRTC.h b/content/media/webrtc/MediaEngineWebRTC.h index f94747095c44..b9d63e830500 100644 --- a/content/media/webrtc/MediaEngineWebRTC.h +++ b/content/media/webrtc/MediaEngineWebRTC.h @@ -148,8 +148,7 @@ public: virtual nsresult Snapshot(uint32_t aDuration, nsIDOMFile** aFile); virtual nsresult Config(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay) { return NS_OK; }; + bool aNoiseOn, uint32_t aNoise) { return NS_OK; }; virtual void NotifyPull(MediaStreamGraph* aGraph, SourceMediaStream *aSource, TrackID aId, @@ -265,7 +264,6 @@ public: , mEchoCancel(webrtc::kEcDefault) , mAGC(webrtc::kAgcDefault) , mNoiseSuppress(webrtc::kNsDefault) - , mPlayoutDelay(0) , mNullTransport(nullptr) { MOZ_ASSERT(aVoiceEnginePtr); mState = kReleased; @@ -285,8 +283,7 @@ public: virtual nsresult Snapshot(uint32_t aDuration, nsIDOMFile** aFile); virtual nsresult Config(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay); + bool aNoiseOn, uint32_t aNoise); virtual void NotifyPull(MediaStreamGraph* aGraph, SourceMediaStream *aSource, @@ -337,7 +334,6 @@ private: webrtc::EcModes mEchoCancel; webrtc::AgcModes mAGC; webrtc::NsModes mNoiseSuppress; - int32_t mPlayoutDelay; NullTransport *mNullTransport; }; diff --git a/content/media/webrtc/MediaEngineWebRTCAudio.cpp b/content/media/webrtc/MediaEngineWebRTCAudio.cpp index eb163c364494..057dfdea5439 100644 --- a/content/media/webrtc/MediaEngineWebRTCAudio.cpp +++ b/content/media/webrtc/MediaEngineWebRTCAudio.cpp @@ -180,8 +180,7 @@ MediaEngineWebRTCAudioSource::GetUUID(nsAString& aUUID) nsresult MediaEngineWebRTCAudioSource::Config(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay) + bool aNoiseOn, uint32_t aNoise) { LOG(("Audio config: aec: %d, agc: %d, noise: %d", aEchoOn ? aEcho : -1, @@ -205,7 +204,6 @@ MediaEngineWebRTCAudioSource::Config(bool aEchoOn, uint32_t aEcho, mNoiseSuppress = (webrtc::NsModes) aNoise; } } - mPlayoutDelay = aPlayoutDelay; if (mInitDone) { int error; diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index a31b1ce459ee..0ff975fe3236 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -595,7 +595,6 @@ public: int32_t agc = (int32_t) webrtc::kAgcUnchanged; int32_t noise = (int32_t) webrtc::kNsUnchanged; bool aec_on = false, agc_on = false, noise_on = false; - int32_t playout_delay = 0; branch->GetBoolPref("media.peerconnection.aec_enabled", &aec_on); branch->GetIntPref("media.peerconnection.aec", &aec); @@ -603,12 +602,10 @@ public: branch->GetIntPref("media.peerconnection.agc", &agc); branch->GetBoolPref("media.peerconnection.noise_enabled", &noise_on); branch->GetIntPref("media.peerconnection.noise", &noise); - branch->GetIntPref("media.peerconnection.playout_delay", &playout_delay); mListener->AudioConfig(aec_on, (uint32_t) aec, agc_on, (uint32_t) agc, - noise_on, (uint32_t) noise, - playout_delay); + noise_on, (uint32_t) noise); } } #endif diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h index b1b9bc6a2c2e..5f07421ec161 100644 --- a/dom/media/MediaManager.h +++ b/dom/media/MediaManager.h @@ -128,8 +128,7 @@ public: void AudioConfig(bool aEchoOn, uint32_t aEcho, bool aAgcOn, uint32_t aAGC, - bool aNoiseOn, uint32_t aNoise, - int32_t aPlayoutDelay) + bool aNoiseOn, uint32_t aNoise) { if (mAudioSource) { #ifdef MOZ_WEBRTC @@ -137,7 +136,7 @@ public: RUN_ON_THREAD(mMediaThread, WrapRunnable(nsRefPtr(mAudioSource), // threadsafe &MediaEngineSource::Config, - aEchoOn, aEcho, aAgcOn, aAGC, aNoiseOn, aNoise, aPlayoutDelay), + aEchoOn, aEcho, aAgcOn, aAGC, aNoiseOn, aNoise), NS_DISPATCH_NORMAL); #endif }