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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 177 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
178 int error = channel()->RegisterExternalTransport(transport); | 178 int error = channel()->RegisterExternalTransport(transport); |
179 RTC_DCHECK_EQ(0, error); | 179 RTC_DCHECK_EQ(0, error); |
180 } | 180 } |
181 | 181 |
182 void ChannelProxy::DeRegisterExternalTransport() { | 182 void ChannelProxy::DeRegisterExternalTransport() { |
183 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 183 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
184 channel()->DeRegisterExternalTransport(); | 184 channel()->DeRegisterExternalTransport(); |
185 } | 185 } |
186 | 186 |
187 bool ChannelProxy::ReceivedRTPPacket(const uint8_t* packet, | 187 bool ChannelProxy::OnRTPPacket(const RtpPacketReceived& packet) { |
188 size_t length, | |
189 const PacketTime& packet_time) { | |
190 // May be called on either worker thread or network thread. | 188 // May be called on either worker thread or network thread. |
191 return channel()->ReceivedRTPPacket(packet, length, packet_time) == 0; | 189 return channel()->OnRTPPacket(packet) == 0; |
192 } | 190 } |
193 | 191 |
194 bool ChannelProxy::ReceivedRTCPPacket(const uint8_t* packet, size_t length) { | 192 bool ChannelProxy::ReceivedRTCPPacket(const uint8_t* packet, size_t length) { |
195 // May be called on either worker thread or network thread. | 193 // May be called on either worker thread or network thread. |
196 return channel()->ReceivedRTCPPacket(packet, length) == 0; | 194 return channel()->ReceivedRTCPPacket(packet, length) == 0; |
197 } | 195 } |
198 | 196 |
199 const rtc::scoped_refptr<AudioDecoderFactory>& | 197 const rtc::scoped_refptr<AudioDecoderFactory>& |
200 ChannelProxy::GetAudioDecoderFactory() const { | 198 ChannelProxy::GetAudioDecoderFactory() const { |
201 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 199 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 return channel()->SetSendCNPayloadType(type, frequency) == 0; | 365 return channel()->SetSendCNPayloadType(type, frequency) == 0; |
368 } | 366 } |
369 | 367 |
370 Channel* ChannelProxy::channel() const { | 368 Channel* ChannelProxy::channel() const { |
371 RTC_DCHECK(channel_owner_.channel()); | 369 RTC_DCHECK(channel_owner_.channel()); |
372 return channel_owner_.channel(); | 370 return channel_owner_.channel(); |
373 } | 371 } |
374 | 372 |
375 } // namespace voe | 373 } // namespace voe |
376 } // namespace webrtc | 374 } // namespace webrtc |
OLD | NEW |