Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1225)

Side by Side Diff: content/renderer/media/media_stream_audio_processor_options.cc

Issue 367923004: Turn audio ducking on by default on Windows again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_audio_processor_options.h" 5 #include "content/renderer/media/media_stream_audio_processor_options.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 // Enable the extended filter mode AEC on all non-mobile platforms. 55 // Enable the extended filter mode AEC on all non-mobile platforms.
56 { MediaAudioConstraints::kGoogExperimentalEchoCancellation, true }, 56 { MediaAudioConstraints::kGoogExperimentalEchoCancellation, true },
57 #endif 57 #endif
58 { MediaAudioConstraints::kGoogAutoGainControl, true }, 58 { MediaAudioConstraints::kGoogAutoGainControl, true },
59 { MediaAudioConstraints::kGoogExperimentalAutoGainControl, true }, 59 { MediaAudioConstraints::kGoogExperimentalAutoGainControl, true },
60 { MediaAudioConstraints::kGoogNoiseSuppression, true }, 60 { MediaAudioConstraints::kGoogNoiseSuppression, true },
61 { MediaAudioConstraints::kGoogHighpassFilter, true }, 61 { MediaAudioConstraints::kGoogHighpassFilter, true },
62 { MediaAudioConstraints::kGoogTypingNoiseDetection, true }, 62 { MediaAudioConstraints::kGoogTypingNoiseDetection, true },
63 { MediaAudioConstraints::kGoogExperimentalNoiseSuppression, false }, 63 { MediaAudioConstraints::kGoogExperimentalNoiseSuppression, false },
64 #if defined(OS_WIN) 64 #if defined(OS_WIN)
65 // TODO(tommi): Turn this back to |true| on Windows when ducking issues 65 { kMediaStreamAudioDucking, true },
66 // have been resolved.
67 // Bugs: crbug/391414, crbug/391247.
68 { kMediaStreamAudioDucking, false },
69 #else 66 #else
70 { kMediaStreamAudioDucking, false }, 67 { kMediaStreamAudioDucking, false },
71 #endif 68 #endif
72 }; 69 };
73 70
74 bool IsAudioProcessingConstraint(const std::string& key) { 71 bool IsAudioProcessingConstraint(const std::string& key) {
75 // |kMediaStreamAudioDucking| does not require audio processing. 72 // |kMediaStreamAudioDucking| does not require audio processing.
76 return key != kMediaStreamAudioDucking; 73 return key != kMediaStreamAudioDucking;
77 } 74 }
78 75
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 } 323 }
327 324
328 int median = 0, std = 0; 325 int median = 0, std = 0;
329 if (!audio_processing->echo_cancellation()->GetDelayMetrics(&median, &std)) { 326 if (!audio_processing->echo_cancellation()->GetDelayMetrics(&median, &std)) {
330 stats->echo_delay_median_ms = median; 327 stats->echo_delay_median_ms = median;
331 stats->echo_delay_std_ms = std; 328 stats->echo_delay_std_ms = std;
332 } 329 }
333 } 330 }
334 331
335 } // namespace content 332 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698