From 39b31001d2d74373f1e60cdbc8e57e402bdf34e3 Mon Sep 17 00:00:00 2001 From: tommi Date: Tue, 23 Jun 2015 09:50:47 -0700 Subject: [PATCH] Change kEchoCancellation to be 'echoCancellation'. This is the second cl in WebRTC for this change and will be landed after Chromium has been updated to use kGooglEchoCancellation where that variant is required. See also the first part: https://codereview.webrtc.org/1179233003 BUG=webrtc:4747 R=andrew@webrtc.org Review URL: https://codereview.webrtc.org/1185963003 Cr-Commit-Position: refs/heads/master@{#9490} --- talk/app/webrtc/mediaconstraintsinterface.cc | 2 +- talk/app/webrtc/mediaconstraintsinterface.h | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/talk/app/webrtc/mediaconstraintsinterface.cc b/talk/app/webrtc/mediaconstraintsinterface.cc index 2c918d8d5..66a2ad2cb 100644 --- a/talk/app/webrtc/mediaconstraintsinterface.cc +++ b/talk/app/webrtc/mediaconstraintsinterface.cc @@ -47,7 +47,7 @@ const char MediaConstraintsInterface::kMinFrameRate[] = "minFrameRate"; // Audio constraints. const char MediaConstraintsInterface::kEchoCancellation[] = - "googEchoCancellation"; + "echoCancellation"; const char MediaConstraintsInterface::kGoogEchoCancellation[] = "googEchoCancellation"; const char MediaConstraintsInterface::kExtendedFilterEchoCancellation[] = diff --git a/talk/app/webrtc/mediaconstraintsinterface.h b/talk/app/webrtc/mediaconstraintsinterface.h index e58b2f80d..777c3cc55 100644 --- a/talk/app/webrtc/mediaconstraintsinterface.h +++ b/talk/app/webrtc/mediaconstraintsinterface.h @@ -72,12 +72,9 @@ class MediaConstraintsInterface { static const char kMinFrameRate[]; // minFrameRate // Constraint keys used by a local audio source. + static const char kEchoCancellation[]; // echoCancellation + // These keys are google specific. - // TODO(tommi): Change kEchoCancellation to be "echoCancellation" once - // Chrome has been updated to use kGoogEchoCancellation where the 'goog' - // variant is needed. - // See https://code.google.com/p/webrtc/issues/detail?id=4747 - static const char kEchoCancellation[]; // googEchoCancellation static const char kGoogEchoCancellation[]; // googEchoCancellation static const char kExtendedFilterEchoCancellation[]; // googEchoCancellation2