Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1111)

Unified Diff: webrtc/voice_engine/channel.h

Issue 2638083002: Attach TransportFeedbackPacketLossTracker to ANA (PLR only) (Closed)
Patch Set: SSRC() Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index 60e6f6040cd906f15c7a2b831db58d8b6be30580..09e3ed327e0b9a0ba2b9e531f619a6df82e60992 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -33,6 +33,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"
#include "webrtc/voice_engine/voice_engine_defines.h"
namespace rtc {
@@ -376,8 +377,15 @@ 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
+ // 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(
+ const rtc::Optional<float>& packet_loss_rate);
minyue-webrtc 2017/03/17 09:20:32 I think the arg should be "float packet_loss_rate"
elad.alon_webrtc.org 2017/03/17 10:10:33 An unknown is possible when a new feedback arrives
+
protected:
- void OnIncomingFractionLoss(int fraction_lost);
+ void OnUplinkPacketLossRate(float packet_loss_rate);
private:
bool InputMute() const;
@@ -504,6 +512,8 @@ class Channel
// TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
+
+ const bool use_twcc_plr_for_ana_;
};
} // namespace voe

Powered by Google App Engine
This is Rietveld 408576698