diff options
| author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-09 08:10:28 +0000 |
|---|---|---|
| committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-09 08:10:28 +0000 |
| commit | be2d262c17831a5f532c1328754e5bcaef88bf48 (patch) | |
| tree | ccf7c9451e020815f508a242e07c1e9af52f49af /content/browser | |
| parent | ce40730b663d21e00e9b987e574bfa994d66dcd8 (diff) | |
| download | chromium_src-be2d262c17831a5f532c1328754e5bcaef88bf48.zip chromium_src-be2d262c17831a5f532c1328754e5bcaef88bf48.tar.gz chromium_src-be2d262c17831a5f532c1328754e5bcaef88bf48.tar.bz2 | |
Revert 273044 "Change kEnableAudioTrackProcessing to a disable f..."
> Change kEnableAudioTrackProcessing to a disable flag and remove finch code for AudioTrackProcessing.
>
> The plan is to enable audio processing in getUserMedia as default for M37, and keep a kDisableAudioTrackProcessing flag to be able to fall back to the old path.
>
> BUG=365672
> TEST=bots
>
> Review URL: https://codereview.chromium.org/293023003
TBR=xians@chromium.org
Review URL: https://codereview.chromium.org/318373002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/media/webrtc_browsertest.cc | 4 | ||||
| -rw-r--r-- | content/browser/media/webrtc_getusermedia_browsertest.cc | 4 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 9a003a4..482b42b 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -43,8 +43,8 @@ class WebRtcBrowserTest : public WebRtcContentBrowserTest, WebRtcContentBrowserTest::SetUpCommandLine(command_line); bool enable_audio_track_processing = GetParam(); - if (!enable_audio_track_processing) - command_line->AppendSwitch(switches::kDisableAudioTrackProcessing); + if (enable_audio_track_processing) + command_line->AppendSwitch(switches::kEnableAudioTrackProcessing); } virtual void TearDownOnMainThread() OVERRIDE { diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc index 54e64e6..5531408 100644 --- a/content/browser/media/webrtc_getusermedia_browsertest.cc +++ b/content/browser/media/webrtc_getusermedia_browsertest.cc @@ -85,8 +85,8 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest, WebRtcContentBrowserTest::SetUpCommandLine(command_line); bool enable_audio_track_processing = GetParam(); - if (!enable_audio_track_processing) - command_line->AppendSwitch(switches::kDisableAudioTrackProcessing); + if (enable_audio_track_processing) + command_line->AppendSwitch(switches::kEnableAudioTrackProcessing); } void StartTracing() { diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 11a629d..150ce1e 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1230,7 +1230,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kEnablePepperTesting, #endif #if defined(ENABLE_WEBRTC) - switches::kDisableAudioTrackProcessing, + switches::kEnableAudioTrackProcessing, switches::kDisableDeviceEnumeration, switches::kDisableWebRtcHWDecoding, switches::kDisableWebRtcHWEncoding, |