Chromium Code Reviews| Index: webrtc/voice_engine/channel.h |
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h |
| index 7d9a17fcf39c86b79fd33b8a9289cf6d9b00cc2a..bb816bfd3d4831a0a06544637db87a7eb137aaa1 100644 |
| --- a/webrtc/voice_engine/channel.h |
| +++ b/webrtc/voice_engine/channel.h |
| @@ -269,8 +269,8 @@ class Channel |
| // VoEVolumeControl |
| int GetSpeechOutputLevel(uint32_t& level) const; |
| int GetSpeechOutputLevelFullRange(uint32_t& level) const; |
| - int SetMute(bool enable); |
| - bool Mute() const; |
| + int SetInputMute(bool enable); |
|
peah-webrtc
2016/03/23 15:57:04
What is motivates the name change to InputMute? Ca
the sun
2016/03/23 21:30:53
The voe::Channel is duplex. SetMute() could mean t
peah-webrtc
2016/03/24 07:04:54
Yes, I saw the other InputMute function but this c
the sun
2016/03/24 09:33:15
Input mute = mute the microphone
Output mute = mut
|
| + bool InputMute() const; |
| int SetOutputVolumePan(float left, float right); |
| int GetOutputVolumePan(float& left, float& right) const; |
| int SetChannelOutputVolumeScaling(float scaling); |
| @@ -536,10 +536,11 @@ class Channel |
| bool _externalMixing; |
| bool _mixFileWithMicrophone; |
| // VoEVolumeControl |
| - bool _mute; |
| - float _panLeft; |
| - float _panRight; |
| - float _outputGain; |
| + bool input_mute_ GUARDED_BY(volume_settings_critsect_); |
| + bool cached_input_mute_; // Only accessed from PrepareEncodeAndSend(). |
| + float _panLeft GUARDED_BY(volume_settings_critsect_); |
| + float _panRight GUARDED_BY(volume_settings_critsect_); |
| + float _outputGain GUARDED_BY(volume_settings_critsect_); |
| // VoeRTP_RTCP |
| uint32_t _lastLocalTimeStamp; |
| int8_t _lastPayloadType; |