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

Unified Diff: content/renderer/media/media_stream_audio_processor_options.cc

Issue 227743004: Added a kEchoCancellation constraint to turn off the audio processing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: moved some of the constraints code to MediaAudioConstraints class, and hope it makes the code more … Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_audio_processor_options.cc
diff --git a/content/renderer/media/media_stream_audio_processor_options.cc b/content/renderer/media/media_stream_audio_processor_options.cc
index 320d1a6ba31d8296160a2a67b1c07523aa4d12ef..0331af343e6dce15e7aaa5f798ccdaa118c1a335 100644
--- a/content/renderer/media/media_stream_audio_processor_options.cc
+++ b/content/renderer/media/media_stream_audio_processor_options.cc
@@ -7,57 +7,93 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "content/common/media/media_stream_options.h"
+#include "content/renderer/media/media_stream_constraints_util.h"
#include "content/renderer/media/rtc_media_constraints.h"
#include "media/audio/audio_parameters.h"
-#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
#include "third_party/webrtc/modules/audio_processing/typing_detection.h"
namespace content {
+const char MediaAudioConstraints::kEchoCancellation[] = "echoCancellation";
+const char MediaAudioConstraints::kGoogEchoCancellation[] =
+ "googEchoCancellation";
+const char MediaAudioConstraints::kGoogExperimentalEchoCancellation[] =
+ "googEchoCancellation2";
+const char MediaAudioConstraints::kGoogAutoGainControl[] =
+ "googAutoGainControl";
+const char MediaAudioConstraints::kGoogExperimentalAutoGainControl[] =
+ "googAutoGainControl2";
+const char MediaAudioConstraints::kGoogNoiseSuppression[] =
+ "googNoiseSuppression";
+const char MediaAudioConstraints::kGoogExperimentalNoiseSuppression[] =
+ "googNoiseSuppression2";
+const char MediaAudioConstraints::kGoogHighpassFilter[] = "googHighpassFilter";
+const char MediaAudioConstraints::kGoogTypingNoiseDetection[] =
+ "googTypingNoiseDetection";
+const char MediaAudioConstraints::kGoogAudioMirroring[] = "googAudioMirroring";
+
namespace {
// Constant constraint keys which enables default audio constraints on
// mediastreams with audio.
struct {
const char* key;
- const char* value;
+ bool value;
} const kDefaultAudioConstraints[] = {
- { webrtc::MediaConstraintsInterface::kEchoCancellation,
- webrtc::MediaConstraintsInterface::kValueTrue },
+ { MediaAudioConstraints::kEchoCancellation, true },
+ { MediaAudioConstraints::kGoogEchoCancellation, true },
#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
// Enable the extended filter mode AEC on platforms with known echo issues.
- { webrtc::MediaConstraintsInterface::kExperimentalEchoCancellation,
- webrtc::MediaConstraintsInterface::kValueTrue },
+ { MediaAudioConstraints::kGoogExperimentalEchoCancellation, true },
+#else
+ { MediaAudioConstraints::kGoogExperimentalEchoCancellation, false },
#endif
- { webrtc::MediaConstraintsInterface::kAutoGainControl,
- webrtc::MediaConstraintsInterface::kValueTrue },
- { webrtc::MediaConstraintsInterface::kExperimentalAutoGainControl,
- webrtc::MediaConstraintsInterface::kValueTrue },
- { webrtc::MediaConstraintsInterface::kNoiseSuppression,
- webrtc::MediaConstraintsInterface::kValueTrue },
- { webrtc::MediaConstraintsInterface::kHighpassFilter,
- webrtc::MediaConstraintsInterface::kValueTrue },
- { webrtc::MediaConstraintsInterface::kTypingNoiseDetection,
- webrtc::MediaConstraintsInterface::kValueTrue },
+ { MediaAudioConstraints::kGoogAutoGainControl, true },
+ { MediaAudioConstraints::kGoogExperimentalAutoGainControl, true },
+ { MediaAudioConstraints::kGoogNoiseSuppression, true },
+ { MediaAudioConstraints::kGoogHighpassFilter, true },
+ { MediaAudioConstraints::kGoogTypingNoiseDetection, true },
+ { MediaAudioConstraints::kGoogExperimentalNoiseSuppression, false },
#if defined(OS_WIN)
- { content::kMediaStreamAudioDucking,
- webrtc::MediaConstraintsInterface::kValueTrue },
+ { kMediaStreamAudioDucking, true },
+#else
+ { kMediaStreamAudioDucking, false },
#endif
};
+bool GetDefaultValueForConstraint(const blink::WebMediaConstraints& constraints,
+ const std::string& key) {
+ // The default audio processing is false for gUM with a specific
+ // kMediaStreamSource.
perkj_chrome 2014/04/14 12:15:19 Please explain what kMediaSource is.
no longer working on chromium 2014/04/14 14:40:50 Done with adding "which is used by tab capture and
+ std::string value;
+ if (GetConstraintValue(constraints, kMediaStreamSource, &value))
+ return false;
+
+ for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++i) {
perkj_chrome 2014/04/14 12:15:19 arraysize ?
no longer working on chromium 2014/04/14 14:40:50 It is not possible before of the struct type used
+ if (kDefaultAudioConstraints[i].key == key)
+ return kDefaultAudioConstraints[i].value;
+ }
+
+ return false;
+}
+
} // namespace
-void ApplyFixedAudioConstraints(RTCMediaConstraints* constraints) {
+// TODO(xians): Remove this method after the APM in WebRtc is deprecated.
+void MediaAudioConstraints::ApplyFixedAudioConstraints(
+ RTCMediaConstraints* constraints) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++i) {
perkj_chrome 2014/04/14 12:15:19 arraysize ?
no longer working on chromium 2014/04/14 14:40:50 ditto.
bool already_set_value;
if (!webrtc::FindConstraint(constraints, kDefaultAudioConstraints[i].key,
&already_set_value, NULL)) {
- constraints->AddOptional(kDefaultAudioConstraints[i].key,
- kDefaultAudioConstraints[i].value, false);
+ const std::string value = kDefaultAudioConstraints[i].value ?
+ webrtc::MediaConstraintsInterface::kValueTrue :
+ webrtc::MediaConstraintsInterface::kValueFalse;
+ constraints->AddOptional(kDefaultAudioConstraints[i].key, value, false);
} else {
DVLOG(1) << "Constraint " << kDefaultAudioConstraints[i].key
<< " already set to " << already_set_value;
@@ -65,32 +101,61 @@ void ApplyFixedAudioConstraints(RTCMediaConstraints* constraints) {
}
}
-bool NeedsAudioProcessing(const blink::WebMediaConstraints& constraints,
- int effects) {
- RTCMediaConstraints native_constraints(constraints);
- ApplyFixedAudioConstraints(&native_constraints);
- if (effects & media::AudioParameters::ECHO_CANCELLER) {
- // If platform echo canceller is enabled, disable the software AEC.
- native_constraints.AddOptional(
- MediaConstraintsInterface::kEchoCancellation,
- MediaConstraintsInterface::kValueFalse, true);
- }
+MediaAudioConstraints::MediaAudioConstraints(
+ const blink::WebMediaConstraints& constraints, int effects)
+ : constraints_(constraints), effects_(effects) {}
+
+MediaAudioConstraints::~MediaAudioConstraints() {}
+
+// TODO(xians): Remove this method after the APM in WebRtc is deprecated.
+bool MediaAudioConstraints::NeedsAudioProcessing() {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++i) {
- bool value = false;
- if (webrtc::FindConstraint(&native_constraints,
- kDefaultAudioConstraints[i].key, &value, NULL) &&
- value) {
+ if (GetProperty(kDefaultAudioConstraints[i].key))
return true;
- }
}
return false;
}
-bool GetPropertyFromConstraints(const MediaConstraintsInterface* constraints,
- const std::string& key) {
+bool MediaAudioConstraints::GetProperty(const std::string& key) {
+ if (effects_ & media::AudioParameters::ECHO_CANCELLER &&
no longer working on chromium 2014/04/11 16:47:05 Andrew, could you please take a look at this? Pre
+ key == kGoogEchoCancellation) {
+ // If platform echo canceller is enabled, disable the software AEC.
+ return false;
+ }
+
+ // Return the value if the constraint is specified in |constraints|,
+ // otherwise return the default value.
bool value = false;
- return webrtc::FindConstraint(constraints, key, &value, NULL) && value;
+ if (!GetConstraintValue(constraints_, key, &value))
+ value = GetDefaultValueForConstraint(constraints_, key);
+
+ return value;
+}
+
+bool MediaAudioConstraints::IsValid() {
+ blink::WebVector<blink::WebMediaConstraint> mandatory;
+ constraints_.getMandatoryConstraints(mandatory);
+ for (size_t i = 0; i < mandatory.size(); ++i) {
+ if (mandatory[i].m_name.utf8() == kMediaStreamSource)
+ continue;
+
+ bool valid = false;
+ for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kDefaultAudioConstraints); ++j) {
+ if (mandatory[i].m_name.utf8() == kDefaultAudioConstraints[j].key) {
+ valid = true;
+ break;
+ }
+ }
+
+ if (!valid) {
+ DLOG(ERROR) << "Invalid MediaStream constraint. Name:"
+ << mandatory[i].m_name.utf8();
+ return false;
+ }
+ }
+
+ return true;
}
void EnableEchoCancellation(AudioProcessing* audio_processing) {
@@ -128,7 +193,7 @@ void EnableHighPassFilter(AudioProcessing* audio_processing) {
}
void EnableTypingDetection(AudioProcessing* audio_processing,
perkj_chrome 2014/04/14 12:15:19 nit: allign paramers or move audio_processing to n
no longer working on chromium 2014/04/14 14:40:50 Done.
- webrtc::TypingDetection* typing_detector) {
+ webrtc::TypingDetection* typing_detector) {
int err = audio_processing->voice_detection()->Enable(true);
err |= audio_processing->voice_detection()->set_likelihood(
webrtc::VoiceDetection::kVeryLowLikelihood);
@@ -145,7 +210,7 @@ void EnableExperimentalEchoCancellation(AudioProcessing* audio_processing) {
}
void StartEchoCancellationDump(AudioProcessing* audio_processing,
- const base::PlatformFile& aec_dump_file) {
+ const base::PlatformFile& aec_dump_file) {
perkj_chrome 2014/04/14 12:15:19 dio
no longer working on chromium 2014/04/14 14:40:50 Done.
DCHECK_NE(aec_dump_file, base::kInvalidPlatformFileValue);
FILE* stream = base::FdopenPlatformFile(aec_dump_file, "w");

Powered by Google App Engine
This is Rietveld 408576698