| Index: webrtc/voice_engine/channel.h
|
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
|
| index f26fdb23d46cf16beb6e65022b210ad90f334bf7..c6f2c879492c60178b7b3641c4fb08d0174f1dec 100644
|
| --- a/webrtc/voice_engine/channel.h
|
| +++ b/webrtc/voice_engine/channel.h
|
| @@ -11,13 +11,18 @@
|
| #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_H_
|
| #define WEBRTC_VOICE_ENGINE_CHANNEL_H_
|
|
|
| +#include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| +#include "webrtc/base/thread_checker.h"
|
| +#include "webrtc/call/congestion_controller.h"
|
| #include "webrtc/common_audio/resampler/include/push_resampler.h"
|
| #include "webrtc/common_types.h"
|
| #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
|
| #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
|
| #include "webrtc/modules/audio_processing/rms_level.h"
|
| #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
|
| +#include "webrtc/modules/pacing/paced_sender.h"
|
| +#include "webrtc/modules/pacing/packet_router.h"
|
| #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
|
| #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
|
| #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
|
| @@ -73,6 +78,10 @@ class StatisticsProxy;
|
| class TransmitMixer;
|
| class VoERtcpObserver;
|
|
|
| +namespace {
|
| +class PacketSenderProxy;
|
| +} // namespace
|
| +
|
| // Helper class to simplify locking scheme for members that are accessed from
|
| // multiple threads.
|
| // Example: a member can be set on thread T1 and read by an internal audio
|
| @@ -321,6 +330,13 @@ public:
|
| int SetReceiveAudioLevelIndicationStatus(bool enable, unsigned char id);
|
| int SetSendAbsoluteSenderTimeStatus(bool enable, unsigned char id);
|
| int SetReceiveAbsoluteSenderTimeStatus(bool enable, unsigned char id);
|
| + void SetSendTransportSequenceNumber(int id);
|
| +
|
| + void SetCongestionControlObjects(
|
| + RtpPacketSender* rtp_packet_sender,
|
| + TransportFeedbackObserver* transport_feedback_observer,
|
| + PacketRouter* packet_router);
|
| +
|
| void SetRTCPStatus(bool enable);
|
| int GetRTCPStatus(bool& enabled);
|
| int SetRTCP_CNAME(const char cName[256]);
|
| @@ -584,6 +600,9 @@ private:
|
| // An associated send channel.
|
| rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_;
|
| ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
|
| +
|
| + rtc::scoped_ptr<PacketSenderProxy> packet_sender_proxy_;
|
| + PacketRouter* packet_router_;
|
| };
|
|
|
| } // namespace voe
|
|
|