Index: webrtc/voice_engine/channel.h |
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h |
index 4056c7fb5688b5b7de5357ab70b876c2a1ef0c32..fd5211b976ae04a79c0b5a77c70b26a95f9ca606 100644 |
--- a/webrtc/voice_engine/channel.h |
+++ b/webrtc/voice_engine/channel.h |
@@ -333,6 +333,7 @@ class Channel |
int SetCodecFECStatus(bool enable); |
bool GetCodecFECStatus(); |
void SetNACKStatus(bool enable, int maxNumberOfPackets); |
+ void AdaptCodec(); |
// From AudioPacketizationCallback in the ACM |
int32_t SendData(FrameType frameType, |
@@ -548,7 +549,9 @@ class Channel |
// TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. |
rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; |
- SmoothingFilterImpl bitrate_smoother_; |
+ rtc::CriticalSection bitrate_smoother_lock_; |
+ SmoothingFilterImpl bitrate_smoother_ GUARDED_BY(bitrate_smoother_lock_); |
+ rtc::Optional<int> bitrate_bps_ GUARDED_BY(bitrate_smoother_lock_); |
}; |
} // namespace voe |