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

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 2685673003: Define RtpTransportControllerSendInterface. (Closed)
Patch Set: Fix rebasing error. Created 3 years, 10 months 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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
11 #include "webrtc/voice_engine/channel.h" 11 #include "webrtc/voice_engine/channel.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <utility> 14 #include <utility>
15 15
16 #include "webrtc/audio/utility/audio_frame_operations.h" 16 #include "webrtc/audio/utility/audio_frame_operations.h"
17 #include "webrtc/base/array_view.h" 17 #include "webrtc/base/array_view.h"
18 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/format_macros.h" 20 #include "webrtc/base/format_macros.h"
21 #include "webrtc/base/logging.h" 21 #include "webrtc/base/logging.h"
22 #include "webrtc/base/rate_limiter.h" 22 #include "webrtc/base/rate_limiter.h"
23 #include "webrtc/base/thread_checker.h" 23 #include "webrtc/base/thread_checker.h"
24 #include "webrtc/base/timeutils.h" 24 #include "webrtc/base/timeutils.h"
25 #include "webrtc/call/rtp_transport_controller.h"
25 #include "webrtc/config.h" 26 #include "webrtc/config.h"
26 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" 27 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
27 #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h" 28 #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
28 #include "webrtc/modules/audio_device/include/audio_device.h" 29 #include "webrtc/modules/audio_device/include/audio_device.h"
29 #include "webrtc/modules/audio_processing/include/audio_processing.h" 30 #include "webrtc/modules/audio_processing/include/audio_processing.h"
30 #include "webrtc/modules/include/module_common_types.h" 31 #include "webrtc/modules/include/module_common_types.h"
31 #include "webrtc/modules/pacing/packet_router.h" 32 #include "webrtc/modules/pacing/packet_router.h"
32 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 33 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
33 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" 34 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
34 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" 35 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
(...skipping 2398 matching lines...) Expand 10 before | Expand all | Expand 10 after
2433 2434
2434 void Channel::EnableReceiveTransportSequenceNumber(int id) { 2435 void Channel::EnableReceiveTransportSequenceNumber(int id) {
2435 rtp_header_parser_->DeregisterRtpHeaderExtension( 2436 rtp_header_parser_->DeregisterRtpHeaderExtension(
2436 kRtpExtensionTransportSequenceNumber); 2437 kRtpExtensionTransportSequenceNumber);
2437 bool ret = rtp_header_parser_->RegisterRtpHeaderExtension( 2438 bool ret = rtp_header_parser_->RegisterRtpHeaderExtension(
2438 kRtpExtensionTransportSequenceNumber, id); 2439 kRtpExtensionTransportSequenceNumber, id);
2439 RTC_DCHECK(ret); 2440 RTC_DCHECK(ret);
2440 } 2441 }
2441 2442
2442 void Channel::RegisterSenderCongestionControlObjects( 2443 void Channel::RegisterSenderCongestionControlObjects(
2443 RtpPacketSender* rtp_packet_sender, 2444 RtpTransportControllerSendInterface* transport,
2444 TransportFeedbackObserver* transport_feedback_observer,
2445 PacketRouter* packet_router,
2446 RtcpBandwidthObserver* bandwidth_observer) { 2445 RtcpBandwidthObserver* bandwidth_observer) {
2446 RtpPacketSender* rtp_packet_sender =
2447 transport->congestion_controller()->pacer();
2448 TransportFeedbackObserver* transport_feedback_observer =
2449 transport->congestion_controller()->GetTransportFeedbackObserver();
2450 PacketRouter* packet_router = transport->packet_router();
2451
2447 RTC_DCHECK(rtp_packet_sender); 2452 RTC_DCHECK(rtp_packet_sender);
2448 RTC_DCHECK(transport_feedback_observer); 2453 RTC_DCHECK(transport_feedback_observer);
2449 RTC_DCHECK(packet_router && !packet_router_); 2454 RTC_DCHECK(packet_router && !packet_router_);
2450 rtcp_observer_->SetBandwidthObserver(bandwidth_observer); 2455 rtcp_observer_->SetBandwidthObserver(bandwidth_observer);
2451 feedback_observer_proxy_->SetTransportFeedbackObserver( 2456 feedback_observer_proxy_->SetTransportFeedbackObserver(
2452 transport_feedback_observer); 2457 transport_feedback_observer);
2453 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router); 2458 seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router);
2454 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender); 2459 rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender);
2455 _rtpRtcpModule->SetStorePacketsStatus(true, 600); 2460 _rtpRtcpModule->SetStorePacketsStatus(true, 600);
2456 packet_router->AddRtpModule(_rtpRtcpModule.get()); 2461 packet_router->AddRtpModule(_rtpRtcpModule.get());
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
3324 int64_t min_rtt = 0; 3329 int64_t min_rtt = 0;
3325 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3330 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3326 0) { 3331 0) {
3327 return 0; 3332 return 0;
3328 } 3333 }
3329 return rtt; 3334 return rtt;
3330 } 3335 }
3331 3336
3332 } // namespace voe 3337 } // namespace voe
3333 } // namespace webrtc 3338 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698