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

Side by Side Diff: webrtc/media/base/mediachannel.h

Issue 2600813002: Revert of Adding error output param to SetConfiguration, using new RTCError type. (Closed)
Patch Set: Created 3 years, 12 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 | « webrtc/api/peerconnectionproxy.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 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // WebRtcVideoChannel2::AddRecvStream copies it to the created 126 // WebRtcVideoChannel2::AddRecvStream copies it to the created
127 // WebRtcVideoReceiveStream, where it is returned by the 127 // WebRtcVideoReceiveStream, where it is returned by the
128 // SmoothsRenderedFrames method. This method is used by the 128 // SmoothsRenderedFrames method. This method is used by the
129 // VideoReceiveStream, where the value is passed on to the 129 // VideoReceiveStream, where the value is passed on to the
130 // IncomingVideoStream constructor. 130 // IncomingVideoStream constructor.
131 bool disable_prerenderer_smoothing = false; 131 bool disable_prerenderer_smoothing = false;
132 132
133 // Enables periodic bandwidth probing in application-limited region. 133 // Enables periodic bandwidth probing in application-limited region.
134 bool periodic_alr_bandwidth_probing = false; 134 bool periodic_alr_bandwidth_probing = false;
135 } video; 135 } video;
136
137 bool operator==(const MediaConfig& o) const {
138 return enable_dscp == o.enable_dscp &&
139 video.enable_cpu_overuse_detection ==
140 o.video.enable_cpu_overuse_detection &&
141 video.suspend_below_min_bitrate ==
142 o.video.suspend_below_min_bitrate &&
143 video.disable_prerenderer_smoothing ==
144 o.video.disable_prerenderer_smoothing &&
145 video.periodic_alr_bandwidth_probing ==
146 o.video.periodic_alr_bandwidth_probing;
147 }
148
149 bool operator!=(const MediaConfig& o) const { return !(*this == o); }
150 }; 136 };
151 137
152 // Options that can be applied to a VoiceMediaChannel or a VoiceMediaEngine. 138 // Options that can be applied to a VoiceMediaChannel or a VoiceMediaEngine.
153 // Used to be flags, but that makes it hard to selectively apply options. 139 // Used to be flags, but that makes it hard to selectively apply options.
154 // We are moving all of the setting of options to structs like this, 140 // We are moving all of the setting of options to structs like this,
155 // but some things currently still use flags. 141 // but some things currently still use flags.
156 struct AudioOptions { 142 struct AudioOptions {
157 void SetAll(const AudioOptions& change) { 143 void SetAll(const AudioOptions& change) {
158 SetFrom(&echo_cancellation, change.echo_cancellation); 144 SetFrom(&echo_cancellation, change.echo_cancellation);
159 SetFrom(&auto_gain_control, change.auto_gain_control); 145 SetFrom(&auto_gain_control, change.auto_gain_control);
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 // Signal when the media channel is ready to send the stream. Arguments are: 1183 // Signal when the media channel is ready to send the stream. Arguments are:
1198 // writable(bool) 1184 // writable(bool)
1199 sigslot::signal1<bool> SignalReadyToSend; 1185 sigslot::signal1<bool> SignalReadyToSend;
1200 // Signal for notifying that the remote side has closed the DataChannel. 1186 // Signal for notifying that the remote side has closed the DataChannel.
1201 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1187 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1202 }; 1188 };
1203 1189
1204 } // namespace cricket 1190 } // namespace cricket
1205 1191
1206 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ 1192 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectionproxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698