| OLD | NEW | 
|---|
| 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  Loading... | 
| 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); } | 
| 136 }; | 150 }; | 
| 137 | 151 | 
| 138 // Options that can be applied to a VoiceMediaChannel or a VoiceMediaEngine. | 152 // Options that can be applied to a VoiceMediaChannel or a VoiceMediaEngine. | 
| 139 // Used to be flags, but that makes it hard to selectively apply options. | 153 // Used to be flags, but that makes it hard to selectively apply options. | 
| 140 // We are moving all of the setting of options to structs like this, | 154 // We are moving all of the setting of options to structs like this, | 
| 141 // but some things currently still use flags. | 155 // but some things currently still use flags. | 
| 142 struct AudioOptions { | 156 struct AudioOptions { | 
| 143   void SetAll(const AudioOptions& change) { | 157   void SetAll(const AudioOptions& change) { | 
| 144     SetFrom(&echo_cancellation, change.echo_cancellation); | 158     SetFrom(&echo_cancellation, change.echo_cancellation); | 
| 145     SetFrom(&auto_gain_control, change.auto_gain_control); | 159     SetFrom(&auto_gain_control, change.auto_gain_control); | 
| (...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1181                    const char*, | 1195                    const char*, | 
| 1182                    size_t> SignalDataReceived; | 1196                    size_t> SignalDataReceived; | 
| 1183   // Signal when the media channel is ready to send the stream. Arguments are: | 1197   // Signal when the media channel is ready to send the stream. Arguments are: | 
| 1184   //     writable(bool) | 1198   //     writable(bool) | 
| 1185   sigslot::signal1<bool> SignalReadyToSend; | 1199   sigslot::signal1<bool> SignalReadyToSend; | 
| 1186 }; | 1200 }; | 
| 1187 | 1201 | 
| 1188 }  // namespace cricket | 1202 }  // namespace cricket | 
| 1189 | 1203 | 
| 1190 #endif  // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 1204 #endif  // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 
| OLD | NEW | 
|---|