Index: talk/media/webrtc/webrtcvoiceengine.h |
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h |
index 5a7952dbfaacb02bfcdf71bd72d5c7cef49b4fc4..ccafaa2a55198e217f9a1dbfbf7c302c6eb6d39f 100644 |
--- a/talk/media/webrtc/webrtcvoiceengine.h |
+++ b/talk/media/webrtc/webrtcvoiceengine.h |
@@ -108,9 +108,6 @@ class WebRtcVoiceEngine |
// Starts AEC dump using existing file. |
bool StartAecDump(rtc::PlatformFile file); |
- // Create a VoiceEngine Channel. |
- int CreateMediaVoiceChannel(); |
- |
private: |
void Construct(); |
void ConstructCodecs(); |
@@ -139,7 +136,7 @@ class WebRtcVoiceEngine |
void StartAecDump(const std::string& filename); |
void StopAecDump(); |
- int CreateVoiceChannel(VoEWrapper* voe); |
+ int CreateVoiceChannel(); |
static const int kDefaultLogSeverity = rtc::LS_WARNING; |
@@ -183,8 +180,6 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
webrtc::Call* call); |
~WebRtcVoiceMediaChannel() override; |
- int voe_channel() const { return voe_channel_; } |
- bool valid() const { return voe_channel_ != -1; } |
const AudioOptions& options() const { return options_; } |
bool SetSendParameters(const AudioSendParameters& params) override; |
@@ -260,7 +255,6 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
bool GetRedSendCodec(const AudioCodec& red_codec, |
const std::vector<AudioCodec>& all_codecs, |
webrtc::CodecInst* send_codec); |
- bool EnableRtcp(int channel); |
bool SetPlayout(int channel, bool playout); |
static Error WebRtcErrorToChannelError(int err_code); |
@@ -279,12 +273,9 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
bool ChangePlayout(bool playout); |
bool ChangeSend(SendFlags send); |
bool ChangeSend(int channel, SendFlags send); |
- void ConfigureSendChannel(int channel); |
bool ConfigureRecvChannel(int channel); |
+ int CreateChannel(); |
bool DeleteChannel(int channel); |
- bool IsDefaultChannel(int channel_id) const { |
- return channel_id == voe_channel(); |
- } |
bool SetSendCodecs(int channel, const std::vector<AudioCodec>& codecs); |
bool SetSendBitrateInternal(int bps); |
@@ -305,7 +296,6 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
rtc::ThreadChecker thread_checker_; |
WebRtcVoiceEngine* const engine_; |
- const int voe_channel_; |
std::vector<AudioCodec> recv_codecs_; |
std::vector<AudioCodec> send_codecs_; |
rtc::scoped_ptr<webrtc::CodecInst> send_codec_; |