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

Side by Side Diff: webrtc/voice_engine/test/auto_test/fakes/conference_transport.h

Issue 1476453002: Clean up PlatformThread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: IsRunning DCHECK Created 5 years 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
OLDNEW
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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 124 }
125 125
126 int GetReceiverChannelForSsrc(unsigned int sender_ssrc) const; 126 int GetReceiverChannelForSsrc(unsigned int sender_ssrc) const;
127 void StorePacket(Packet::Type type, const void* data, size_t len); 127 void StorePacket(Packet::Type type, const void* data, size_t len);
128 void SendPacket(const Packet& packet); 128 void SendPacket(const Packet& packet);
129 bool DispatchPackets(); 129 bool DispatchPackets();
130 130
131 const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> pq_crit_; 131 const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> pq_crit_;
132 const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> stream_crit_; 132 const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> stream_crit_;
133 const rtc::scoped_ptr<webrtc::EventWrapper> packet_event_; 133 const rtc::scoped_ptr<webrtc::EventWrapper> packet_event_;
134 const rtc::scoped_ptr<webrtc::PlatformThread> thread_; 134 rtc::PlatformThread thread_;
135 135
136 unsigned int rtt_ms_; 136 unsigned int rtt_ms_;
137 unsigned int stream_count_; 137 unsigned int stream_count_;
138 138
139 std::map<unsigned int, std::pair<int, int>> streams_ 139 std::map<unsigned int, std::pair<int, int>> streams_
140 GUARDED_BY(stream_crit_.get()); 140 GUARDED_BY(stream_crit_.get());
141 std::deque<Packet> packet_queue_ GUARDED_BY(pq_crit_.get()); 141 std::deque<Packet> packet_queue_ GUARDED_BY(pq_crit_.get());
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_;
(...skipping 10 matching lines...) Expand all
155 webrtc::VoENetwork* remote_network_; 155 webrtc::VoENetwork* remote_network_;
156 webrtc::VoEFile* remote_file_; 156 webrtc::VoEFile* remote_file_;
157 157
158 LoudestFilter loudest_filter_; 158 LoudestFilter loudest_filter_;
159 159
160 const rtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_header_parser_; 160 const rtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_header_parser_;
161 }; 161 };
162 } // namespace voetest 162 } // namespace voetest
163 163
164 #endif // WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_CONFERENCE_TRANSPORT_H_ 164 #endif // WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_CONFERENCE_TRANSPORT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698