talk/app/webrtc/mediaconstraintsinterface.h - Issue 1185963003: Change kEchoCancellation to be 'echoCancellation'.

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

Issue 1185963003: Change kEchoCancellation to be 'echoCancellation'. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@constraint

Patch Set: 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 | « no previous file | talk/app/webrtc/mediaconstraintsinterface.cc » ('j') | no next file with comments »

OLD	NEW
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 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 static const char kMinAspectRatio[]; // minAspectRatio	65 static const char kMinAspectRatio[]; // minAspectRatio

66 static const char kMaxAspectRatio[]; // maxAspectRatio	66 static const char kMaxAspectRatio[]; // maxAspectRatio

67 static const char kMaxWidth[]; // maxWidth	67 static const char kMaxWidth[]; // maxWidth

68 static const char kMinWidth[]; // minWidth	68 static const char kMinWidth[]; // minWidth

69 static const char kMaxHeight[]; // maxHeight	69 static const char kMaxHeight[]; // maxHeight

70 static const char kMinHeight[]; // minHeight	70 static const char kMinHeight[]; // minHeight

71 static const char kMaxFrameRate[]; // maxFrameRate	71 static const char kMaxFrameRate[]; // maxFrameRate

72 static const char kMinFrameRate[]; // minFrameRate	72 static const char kMinFrameRate[]; // minFrameRate

73	73

74 // Constraint keys used by a local audio source.	74 // Constraint keys used by a local audio source.

	75 static const char kEchoCancellation[]; // echoCancellation
	Andrew MacDonald 2015/06/15 04:04:14 Two concerns here: 1. IIUC, due to this code: http Two concerns here: 1. IIUC, due to this code: https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjin... "googEchoCancellation" will have no effect after your change. This would break code such as this: https://webrtc-codereview.appspot.com/53669004/diff/1/talk/examples/android/s... which uses "googEchoCancellation", no? 2. Chromium treats "echoCancellation" as a flag to disable all audio processing: https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m... which I think is a useful interpretation. We should probably be consistent in libjingle.
	76

75 // These keys are google specific.	77 // These keys are google specific.

76 // TODO(tommi): Change kEchoCancellation to be "echoCancellation" once

77 // Chrome has been updated to use kGoogEchoCancellation where the 'goog'

78 // variant is needed.

79 // See https://code.google.com/p/webrtc/issues/detail?id=4747

80 static const char kEchoCancellation[]; // googEchoCancellation

81 static const char kGoogEchoCancellation[]; // googEchoCancellation	78 static const char kGoogEchoCancellation[]; // googEchoCancellation

82	79

83 // TODO(henrik.lundin) Remove kExperimentalEchoCancellation.	80 // TODO(henrik.lundin) Remove kExperimentalEchoCancellation.

84 // https://code.google.com/p/webrtc/issues/detail?id=4696	81 // https://code.google.com/p/webrtc/issues/detail?id=4696

85 static const char kExperimentalEchoCancellation[]; // googEchoCancellation2	82 static const char kExperimentalEchoCancellation[]; // googEchoCancellation2

86 static const char kExtendedFilterEchoCancellation[]; // googEchoCancellation2	83 static const char kExtendedFilterEchoCancellation[]; // googEchoCancellation2

87 static const char kDAEchoCancellation[]; // googDAEchoCancellation	84 static const char kDAEchoCancellation[]; // googDAEchoCancellation

88 static const char kAutoGainControl[]; // googAutoGainControl	85 static const char kAutoGainControl[]; // googAutoGainControl

89 static const char kExperimentalAutoGainControl[]; // googAutoGainControl2	86 static const char kExperimentalAutoGainControl[]; // googAutoGainControl2

90 static const char kNoiseSuppression[]; // googNoiseSuppression	87 static const char kNoiseSuppression[]; // googNoiseSuppression

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 virtual ~MediaConstraintsInterface() {}	149 virtual ~MediaConstraintsInterface() {}

153 };	150 };

154	151

155 bool FindConstraint(const MediaConstraintsInterface* constraints,	152 bool FindConstraint(const MediaConstraintsInterface* constraints,

156 const std::string& key, bool* value,	153 const std::string& key, bool* value,

157 size_t* mandatory_constraints);	154 size_t* mandatory_constraints);

158	155

159 } // namespace webrtc	156 } // namespace webrtc

160	157

161 #endif // TALK_APP_WEBRTC_MEDIACONSTRAINTSINTERFACE_H_	158 #endif // TALK_APP_WEBRTC_MEDIACONSTRAINTSINTERFACE_H_

OLD	NEW