OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
140 std::map<unsigned int, std::pair<int, int>> streams_ GUARDED_BY(stream_crit_); | 140 std::map<unsigned int, std::pair<int, int>> streams_ GUARDED_BY(stream_crit_); |
141 std::deque<Packet> packet_queue_ GUARDED_BY(pq_crit_); | 141 std::deque<Packet> packet_queue_ GUARDED_BY(pq_crit_); |
142 | 142 |
143 int local_sender_; // Channel Id of local sender | 143 int local_sender_; // Channel Id of local sender |
144 int reflector_; | 144 int reflector_; |
145 | 145 |
146 webrtc::VoiceEngine* local_voe_; | 146 webrtc::VoiceEngine* local_voe_; |
147 webrtc::VoEBase* local_base_; | 147 webrtc::VoEBase* local_base_; |
148 webrtc::VoERTP_RTCP* local_rtp_rtcp_; | 148 webrtc::VoERTP_RTCP* local_rtp_rtcp_; |
149 webrtc::VoENetwork* local_network_; | 149 webrtc::VoENetwork* local_network_; |
150 rtc::scoped_refptr<webrtc::AudioProcessing> local_apm_; | |
150 | 151 |
151 webrtc::VoiceEngine* remote_voe_; | 152 webrtc::VoiceEngine* remote_voe_; |
152 webrtc::VoEBase* remote_base_; | 153 webrtc::VoEBase* remote_base_; |
153 webrtc::VoECodec* remote_codec_; | 154 webrtc::VoECodec* remote_codec_; |
154 webrtc::VoERTP_RTCP* remote_rtp_rtcp_; | 155 webrtc::VoERTP_RTCP* remote_rtp_rtcp_; |
155 webrtc::VoENetwork* remote_network_; | 156 webrtc::VoENetwork* remote_network_; |
156 webrtc::VoEFile* remote_file_; | 157 webrtc::VoEFile* remote_file_; |
157 | 158 std::unique_ptr<webrtc::AudioProcessing> remote_apm_; |
the sun
2017/06/29 10:41:52
Use scoped for both
peah-webrtc
2017/06/29 11:46:32
Done.
| |
158 LoudestFilter loudest_filter_; | 159 LoudestFilter loudest_filter_; |
159 | 160 |
160 const std::unique_ptr<webrtc::RtpHeaderParser> rtp_header_parser_; | 161 const std::unique_ptr<webrtc::RtpHeaderParser> rtp_header_parser_; |
161 }; | 162 }; |
162 | 163 |
163 } // namespace voetest | 164 } // namespace voetest |
164 } // namespace webrtc | 165 } // namespace webrtc |
165 | 166 |
166 #endif // WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_CONFERENCE_TRANSPORT_H_ | 167 #endif // WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_CONFERENCE_TRANSPORT_H_ |
OLD | NEW |