Chromium Code Reviews| Index: webrtc/voice_engine/channel.h |
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h |
| index 68d022d4d1fec4725acfda3b791cd5d6eab8ecff..e6e7598dfff0a2d198218618d1b46b13b9c9ac2f 100644 |
| --- a/webrtc/voice_engine/channel.h |
| +++ b/webrtc/voice_engine/channel.h |
| @@ -34,6 +34,7 @@ |
| #include "webrtc/voice_engine/include/voe_base.h" |
| #include "webrtc/voice_engine/include/voe_network.h" |
| #include "webrtc/voice_engine/shared_data.h" |
| +#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h" |
|
the sun
2017/03/22 12:06:42
No need to include this here.
elad.alon_webrtc.org
2017/03/22 14:34:47
Done. (FYI, relic from an older revision where Cha
|
| #include "webrtc/voice_engine/voice_engine_defines.h" |
| namespace rtc { |
| @@ -378,8 +379,14 @@ class Channel |
| // From OverheadObserver in the RTP/RTCP module |
| void OnOverheadChanged(size_t overhead_bytes_per_packet) override; |
| + // Note: The existence of this function alongside OnUplinkPacketLossRate is |
|
the sun
2017/03/22 12:06:42
"Note:" is superfluous.
elad.alon_webrtc.org
2017/03/22 14:34:47
I've removed, but IMHO, it made it immediately cle
|
| + // a compromise. We want the encoder to be agnostic of the PLR source, but |
| + // we also don't want it to receive conflicting information from TWCC and |
| + // from RTCP-XR. |
| + void OnTwccBasedUplinkPacketLossRate(float packet_loss_rate); |
| + |
| protected: |
|
the sun
2017/03/22 12:06:42
Nobody inherits from this class so you should move
elad.alon_webrtc.org
2017/03/22 14:34:47
Done.
|
| - void OnIncomingFractionLoss(int fraction_lost); |
| + void OnUplinkPacketLossRate(float packet_loss_rate); |
| private: |
| bool InputMute() const; |
| @@ -508,6 +515,8 @@ class Channel |
| rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; |
| rtc::ThreadChecker construction_thread_; |
| + |
| + const bool use_twcc_plr_for_ana_; |
| }; |
| } // namespace voe |