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

Side by Side Diff: talk/app/webrtc/mediaconstraintsinterface.cc

Issue 1185963003: Change kEchoCancellation to be 'echoCancellation'. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@constraint
Patch Set: Rebase Created 5 years, 6 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
« no previous file with comments | « talk/app/webrtc/mediaconstraintsinterface.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 29 matching lines...) Expand all
40 const char MediaConstraintsInterface::kMaxAspectRatio[] = "maxAspectRatio"; 40 const char MediaConstraintsInterface::kMaxAspectRatio[] = "maxAspectRatio";
41 const char MediaConstraintsInterface::kMaxWidth[] = "maxWidth"; 41 const char MediaConstraintsInterface::kMaxWidth[] = "maxWidth";
42 const char MediaConstraintsInterface::kMinWidth[] = "minWidth"; 42 const char MediaConstraintsInterface::kMinWidth[] = "minWidth";
43 const char MediaConstraintsInterface::kMaxHeight[] = "maxHeight"; 43 const char MediaConstraintsInterface::kMaxHeight[] = "maxHeight";
44 const char MediaConstraintsInterface::kMinHeight[] = "minHeight"; 44 const char MediaConstraintsInterface::kMinHeight[] = "minHeight";
45 const char MediaConstraintsInterface::kMaxFrameRate[] = "maxFrameRate"; 45 const char MediaConstraintsInterface::kMaxFrameRate[] = "maxFrameRate";
46 const char MediaConstraintsInterface::kMinFrameRate[] = "minFrameRate"; 46 const char MediaConstraintsInterface::kMinFrameRate[] = "minFrameRate";
47 47
48 // Audio constraints. 48 // Audio constraints.
49 const char MediaConstraintsInterface::kEchoCancellation[] = 49 const char MediaConstraintsInterface::kEchoCancellation[] =
50 "googEchoCancellation"; 50 "echoCancellation";
51 const char MediaConstraintsInterface::kGoogEchoCancellation[] = 51 const char MediaConstraintsInterface::kGoogEchoCancellation[] =
52 "googEchoCancellation"; 52 "googEchoCancellation";
53 const char MediaConstraintsInterface::kExperimentalEchoCancellation[] = 53 const char MediaConstraintsInterface::kExperimentalEchoCancellation[] =
54 "googEchoCancellation2"; 54 "googEchoCancellation2";
55 const char MediaConstraintsInterface::kExtendedFilterEchoCancellation[] = 55 const char MediaConstraintsInterface::kExtendedFilterEchoCancellation[] =
56 "googEchoCancellation2"; 56 "googEchoCancellation2";
57 const char MediaConstraintsInterface::kDAEchoCancellation[] = 57 const char MediaConstraintsInterface::kDAEchoCancellation[] =
58 "googDAEchoCancellation"; 58 "googDAEchoCancellation";
59 const char MediaConstraintsInterface::kAutoGainControl[] = 59 const char MediaConstraintsInterface::kAutoGainControl[] =
60 "googAutoGainControl"; 60 "googAutoGainControl";
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 ++*mandatory_constraints; 160 ++*mandatory_constraints;
161 return rtc::FromString(string_value, value); 161 return rtc::FromString(string_value, value);
162 } 162 }
163 if (constraints->GetOptional().FindFirst(key, &string_value)) { 163 if (constraints->GetOptional().FindFirst(key, &string_value)) {
164 return rtc::FromString(string_value, value); 164 return rtc::FromString(string_value, value);
165 } 165 }
166 return false; 166 return false;
167 } 167 }
168 168
169 } // namespace webrtc 169 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/mediaconstraintsinterface.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698