Index: talk/media/webrtc/webrtcvoiceengine.h |
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h |
index 2c19df7c63d8aff492df7946b3d303dc3108f023..b41f54d795466c9398055841f669099d985424b5 100644 |
--- a/talk/media/webrtc/webrtcvoiceengine.h |
+++ b/talk/media/webrtc/webrtcvoiceengine.h |
@@ -100,7 +100,9 @@ class WebRtcVoiceEngine |
void Terminate(); |
int GetCapabilities(); |
- VoiceMediaChannel* CreateChannel(const AudioOptions& options); |
+ webrtc::VoiceEngine* GetVoE() { return voe()->engine(); } |
+ VoiceMediaChannel* CreateChannel(webrtc::Call* call, |
+ const AudioOptions& options); |
AudioOptions GetOptions() const { return options_; } |
bool SetOptions(const AudioOptions& options); |
@@ -280,7 +282,8 @@ class WebRtcVoiceEngine |
class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
public webrtc::Transport { |
public: |
- explicit WebRtcVoiceMediaChannel(WebRtcVoiceEngine *engine); |
+ explicit WebRtcVoiceMediaChannel(WebRtcVoiceEngine* engine, |
+ webrtc::Call* call); |
~WebRtcVoiceMediaChannel() override; |
int voe_channel() const { return voe_channel_; } |
@@ -360,8 +363,6 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
int GetReceiveChannelNum(uint32 ssrc) const; |
int GetSendChannelNum(uint32 ssrc) const; |
- void SetCall(webrtc::Call* call); |
- |
private: |
WebRtcVoiceEngine* engine() { return engine_; } |
int GetLastEngineError() { return engine()->GetLastEngineError(); } |
@@ -404,8 +405,9 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel, |
bool SetHeaderExtension(ExtensionSetterFunction setter, int channel_id, |
const RtpHeaderExtension* extension); |
- void TryAddAudioRecvStream(uint32 ssrc); |
- void TryRemoveAudioRecvStream(uint32 ssrc); |
+ void RecreateCallStreams(); |
+ void AddAudioRecvStream(uint32 ssrc); |
+ void RemoveAudioRecvStream(uint32 ssrc); |
bool SetRecvCodecsInternal(const std::vector<AudioCodec>& new_codecs); |
bool SetChannelRecvRtpHeaderExtensions( |