| Index: talk/media/webrtc/webrtcvoe.h
|
| diff --git a/talk/media/webrtc/webrtcvoe.h b/talk/media/webrtc/webrtcvoe.h
|
| index db6a64a1fe4914442e0b094acb9110d669aef428..844831feb9466392afb4d5a6e19d598f3aeb6346 100644
|
| --- a/talk/media/webrtc/webrtcvoe.h
|
| +++ b/talk/media/webrtc/webrtcvoe.h
|
| @@ -38,9 +38,13 @@
|
| #include "webrtc/voice_engine/include/voe_codec.h"
|
| #include "webrtc/voice_engine/include/voe_dtmf.h"
|
| #include "webrtc/voice_engine/include/voe_errors.h"
|
| +#include "webrtc/voice_engine/include/voe_external_media.h"
|
| +#include "webrtc/voice_engine/include/voe_file.h"
|
| #include "webrtc/voice_engine/include/voe_hardware.h"
|
| +#include "webrtc/voice_engine/include/voe_neteq_stats.h"
|
| #include "webrtc/voice_engine/include/voe_network.h"
|
| #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
|
| +#include "webrtc/voice_engine/include/voe_video_sync.h"
|
| #include "webrtc/voice_engine/include/voe_volume_control.h"
|
|
|
| namespace cricket {
|
| @@ -92,16 +96,18 @@
|
| VoEWrapper()
|
| : engine_(webrtc::VoiceEngine::Create()), processing_(engine_),
|
| base_(engine_), codec_(engine_), dtmf_(engine_),
|
| - hw_(engine_), network_(engine_),
|
| - rtp_(engine_), volume_(engine_) {
|
| + hw_(engine_), neteq_(engine_), network_(engine_),
|
| + rtp_(engine_), sync_(engine_), volume_(engine_) {
|
| }
|
| VoEWrapper(webrtc::VoEAudioProcessing* processing,
|
| webrtc::VoEBase* base,
|
| webrtc::VoECodec* codec,
|
| webrtc::VoEDtmf* dtmf,
|
| webrtc::VoEHardware* hw,
|
| + webrtc::VoENetEqStats* neteq,
|
| webrtc::VoENetwork* network,
|
| webrtc::VoERTP_RTCP* rtp,
|
| + webrtc::VoEVideoSync* sync,
|
| webrtc::VoEVolumeControl* volume)
|
| : engine_(NULL),
|
| processing_(processing),
|
| @@ -109,8 +115,10 @@
|
| codec_(codec),
|
| dtmf_(dtmf),
|
| hw_(hw),
|
| + neteq_(neteq),
|
| network_(network),
|
| rtp_(rtp),
|
| + sync_(sync),
|
| volume_(volume) {
|
| }
|
| ~VoEWrapper() {}
|
| @@ -120,8 +128,10 @@
|
| webrtc::VoECodec* codec() const { return codec_.get(); }
|
| webrtc::VoEDtmf* dtmf() const { return dtmf_.get(); }
|
| webrtc::VoEHardware* hw() const { return hw_.get(); }
|
| + webrtc::VoENetEqStats* neteq() const { return neteq_.get(); }
|
| webrtc::VoENetwork* network() const { return network_.get(); }
|
| webrtc::VoERTP_RTCP* rtp() const { return rtp_.get(); }
|
| + webrtc::VoEVideoSync* sync() const { return sync_.get(); }
|
| webrtc::VoEVolumeControl* volume() const { return volume_.get(); }
|
| int error() { return base_->LastError(); }
|
|
|
| @@ -132,8 +142,10 @@
|
| scoped_voe_ptr<webrtc::VoECodec> codec_;
|
| scoped_voe_ptr<webrtc::VoEDtmf> dtmf_;
|
| scoped_voe_ptr<webrtc::VoEHardware> hw_;
|
| + scoped_voe_ptr<webrtc::VoENetEqStats> neteq_;
|
| scoped_voe_ptr<webrtc::VoENetwork> network_;
|
| scoped_voe_ptr<webrtc::VoERTP_RTCP> rtp_;
|
| + scoped_voe_ptr<webrtc::VoEVideoSync> sync_;
|
| scoped_voe_ptr<webrtc::VoEVolumeControl> volume_;
|
| };
|
|
|
|
|