talk/app/webrtc/mediaconstraintsinterface.h - Issue 1179233003: Add kGoogEchoCancellation to MediaConstraintsInterface.

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

Issue 1179233003: Add kGoogEchoCancellation to MediaConstraintsInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

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

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 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 // These keys are google specific.	75 // 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

76 static const char kEchoCancellation[]; // googEchoCancellation	80 static const char kEchoCancellation[]; // googEchoCancellation

	81 static const char kGoogEchoCancellation[]; // googEchoCancellation

	82

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

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

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

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

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

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

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

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

85 static const char kExperimentalNoiseSuppression[]; // googNoiseSuppression2	91 static const char kExperimentalNoiseSuppression[]; // googNoiseSuppression2

86 static const char kHighpassFilter[]; // googHighpassFilter	92 static const char kHighpassFilter[]; // googHighpassFilter

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

147 };	153 };

148	154

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

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

151 size_t* mandatory_constraints);	157 size_t* mandatory_constraints);

152	158

153 } // namespace webrtc	159 } // namespace webrtc

154	160

155 #endif // TALK_APP_WEBRTC_MEDIACONSTRAINTSINTERFACE_H_	161 #endif // TALK_APP_WEBRTC_MEDIACONSTRAINTSINTERFACE_H_

OLD	NEW