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 2250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2261 void WebRtcVoiceMediaChannel::OnPacketReceived( | 2261 void WebRtcVoiceMediaChannel::OnPacketReceived( |
2262 rtc::CopyOnWriteBuffer* packet, const rtc::PacketTime& packet_time) { | 2262 rtc::CopyOnWriteBuffer* packet, const rtc::PacketTime& packet_time) { |
2263 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 2263 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
2264 | 2264 |
2265 const webrtc::PacketTime webrtc_packet_time(packet_time.timestamp, | 2265 const webrtc::PacketTime webrtc_packet_time(packet_time.timestamp, |
2266 packet_time.not_before); | 2266 packet_time.not_before); |
2267 webrtc::PacketReceiver::DeliveryStatus delivery_result = | 2267 webrtc::PacketReceiver::DeliveryStatus delivery_result = |
2268 call_->Receiver()->DeliverPacket(webrtc::MediaType::AUDIO, | 2268 call_->Receiver()->DeliverPacket(webrtc::MediaType::AUDIO, |
2269 packet->cdata(), packet->size(), | 2269 packet->cdata(), packet->size(), |
2270 webrtc_packet_time); | 2270 webrtc_packet_time); |
2271 | |
ossu
2016/04/29 09:12:59
I'm gonna be a bit nit-picky and question the remo
the sun
2016/04/29 11:12:49
You're right, but I'm not uploading a new patch se
| |
2272 if (delivery_result != webrtc::PacketReceiver::DELIVERY_UNKNOWN_SSRC) { | 2271 if (delivery_result != webrtc::PacketReceiver::DELIVERY_UNKNOWN_SSRC) { |
2273 return; | 2272 return; |
2274 } | 2273 } |
2275 | 2274 |
2276 // Create a default receive stream for this unsignalled and previously not | 2275 // Create a default receive stream for this unsignalled and previously not |
2277 // received ssrc. If there already is a default receive stream, delete it. | 2276 // received ssrc. If there already is a default receive stream, delete it. |
2278 // See: https://bugs.chromium.org/p/webrtc/issues/detail?id=5208 | 2277 // See: https://bugs.chromium.org/p/webrtc/issues/detail?id=5208 |
2279 uint32_t ssrc = 0; | 2278 uint32_t ssrc = 0; |
2280 if (!GetRtpSsrc(packet->cdata(), packet->size(), &ssrc)) { | 2279 if (!GetRtpSsrc(packet->cdata(), packet->size(), &ssrc)) { |
2281 return; | 2280 return; |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2557 } | 2556 } |
2558 } else { | 2557 } else { |
2559 LOG(LS_INFO) << "Stopping playout for channel #" << channel; | 2558 LOG(LS_INFO) << "Stopping playout for channel #" << channel; |
2560 engine()->voe()->base()->StopPlayout(channel); | 2559 engine()->voe()->base()->StopPlayout(channel); |
2561 } | 2560 } |
2562 return true; | 2561 return true; |
2563 } | 2562 } |
2564 } // namespace cricket | 2563 } // namespace cricket |
2565 | 2564 |
2566 #endif // HAVE_WEBRTC_VOICE | 2565 #endif // HAVE_WEBRTC_VOICE |
OLD | NEW |