OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) override; | 216 bool InsertDtmf(uint32 ssrc, int event, int duration, int flags) override; |
217 | 217 |
218 void OnPacketReceived(rtc::Buffer* packet, | 218 void OnPacketReceived(rtc::Buffer* packet, |
219 const rtc::PacketTime& packet_time) override; | 219 const rtc::PacketTime& packet_time) override; |
220 void OnRtcpReceived(rtc::Buffer* packet, | 220 void OnRtcpReceived(rtc::Buffer* packet, |
221 const rtc::PacketTime& packet_time) override; | 221 const rtc::PacketTime& packet_time) override; |
222 void OnReadyToSend(bool ready) override {} | 222 void OnReadyToSend(bool ready) override {} |
223 bool GetStats(VoiceMediaInfo* info) override; | 223 bool GetStats(VoiceMediaInfo* info) override; |
224 | 224 |
225 // implements Transport interface | 225 // implements Transport interface |
226 bool SendRtp(const uint8_t* data, size_t len) override { | 226 bool SendRtp(const uint8_t* data, |
| 227 size_t len, |
| 228 const webrtc::PacketOptions& options) override { |
227 rtc::Buffer packet(reinterpret_cast<const uint8_t*>(data), len, | 229 rtc::Buffer packet(reinterpret_cast<const uint8_t*>(data), len, |
228 kMaxRtpPacketLen); | 230 kMaxRtpPacketLen); |
229 return VoiceMediaChannel::SendPacket(&packet); | 231 return VoiceMediaChannel::SendPacket(&packet); |
230 } | 232 } |
231 | 233 |
232 bool SendRtcp(const uint8_t* data, size_t len) override { | 234 bool SendRtcp(const uint8_t* data, size_t len) override { |
233 rtc::Buffer packet(reinterpret_cast<const uint8_t*>(data), len, | 235 rtc::Buffer packet(reinterpret_cast<const uint8_t*>(data), len, |
234 kMaxRtpPacketLen); | 236 kMaxRtpPacketLen); |
235 return VoiceMediaChannel::SendRtcp(&packet); | 237 return VoiceMediaChannel::SendRtcp(&packet); |
236 } | 238 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
344 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 346 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
345 | 347 |
346 // Do not lock this on the VoE media processor thread; potential for deadlock | 348 // Do not lock this on the VoE media processor thread; potential for deadlock |
347 // exists. | 349 // exists. |
348 mutable rtc::CriticalSection receive_channels_cs_; | 350 mutable rtc::CriticalSection receive_channels_cs_; |
349 }; | 351 }; |
350 | 352 |
351 } // namespace cricket | 353 } // namespace cricket |
352 | 354 |
353 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ | 355 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ |
OLD | NEW |