| Index: webrtc/media/engine/webrtcvoiceengine.h
|
| diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
|
| index dbb7ea6e76715a811b75a9b907c0e7c4b077fef1..18c2c543652553264f1fbe61b82f64383ca128c5 100644
|
| --- a/webrtc/media/engine/webrtcvoiceengine.h
|
| +++ b/webrtc/media/engine/webrtcvoiceengine.h
|
| @@ -31,7 +31,7 @@
|
| namespace cricket {
|
|
|
| class AudioDeviceModule;
|
| -class AudioRenderer;
|
| +class AudioSource;
|
| class VoEWrapper;
|
| class WebRtcVoiceMediaChannel;
|
|
|
| @@ -161,7 +161,7 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
|
| bool SetAudioSend(uint32_t ssrc,
|
| bool enable,
|
| const AudioOptions* options,
|
| - AudioRenderer* renderer) override;
|
| + AudioSource* source) override;
|
| bool AddSendStream(const StreamParams& sp) override;
|
| bool RemoveSendStream(uint32_t ssrc) override;
|
| bool AddRecvStream(const StreamParams& sp) override;
|
| @@ -215,7 +215,7 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
|
| bool SetOptions(const AudioOptions& options);
|
| bool SetMaxSendBandwidth(int bps);
|
| bool SetRecvCodecs(const std::vector<AudioCodec>& codecs);
|
| - bool SetLocalRenderer(uint32_t ssrc, AudioRenderer* renderer);
|
| + bool SetLocalSource(uint32_t ssrc, AudioSource* source);
|
| bool MuteStream(uint32_t ssrc, bool mute);
|
|
|
| WebRtcVoiceEngine* engine() { return engine_; }
|
| @@ -225,8 +225,9 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
|
| void SetNack(int channel, bool nack_enabled);
|
| bool SetSendCodec(int channel, const webrtc::CodecInst& send_codec);
|
| bool ChangePlayout(bool playout);
|
| - bool ChangeSend(SendFlags send);
|
| - bool ChangeSend(int channel, SendFlags send);
|
| + // Update the send state for the channel associated with |ssrc|,
|
| + // according to |send| and whether or not the send stream is rendering.
|
| + bool UpdateChannelSendState(uint32_t ssrc, SendFlags send);
|
| int CreateVoEChannel();
|
| bool DeleteVoEChannel(int channel);
|
| bool IsDefaultRecvStream(uint32_t ssrc) {
|
| @@ -249,7 +250,6 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
|
| bool nack_enabled_ = false;
|
| bool transport_cc_enabled_ = false;
|
| bool playout_ = false;
|
| - SendFlags desired_send_ = SEND_NOTHING;
|
| SendFlags send_ = SEND_NOTHING;
|
| webrtc::Call* const call_ = nullptr;
|
|
|
|
|