Index: webrtc/audio/audio_send_stream.h |
diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h |
index 05ed3aaeb8cfb7697e0ea8d54a934ea5fb2d2b45..b0548c7a974573a95f6b7ef971600cf7794276de 100644 |
--- a/webrtc/audio/audio_send_stream.h |
+++ b/webrtc/audio/audio_send_stream.h |
@@ -12,12 +12,14 @@ |
#define WEBRTC_AUDIO_AUDIO_SEND_STREAM_H_ |
#include <memory> |
+#include <vector> |
#include "webrtc/base/constructormagic.h" |
#include "webrtc/base/thread_checker.h" |
#include "webrtc/call/audio_send_stream.h" |
#include "webrtc/call/audio_state.h" |
#include "webrtc/call/bitrate_allocator.h" |
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |
namespace webrtc { |
class CongestionController; |
@@ -32,7 +34,8 @@ class ChannelProxy; |
namespace internal { |
class AudioSendStream final : public webrtc::AudioSendStream, |
- public webrtc::BitrateAllocatorObserver { |
+ public webrtc::BitrateAllocatorObserver, |
+ public webrtc::TransportFeedbackAdapterObserver { |
public: |
AudioSendStream(const webrtc::AudioSendStream::Config& config, |
const rtc::scoped_refptr<webrtc::AudioState>& audio_state, |
@@ -61,6 +64,11 @@ class AudioSendStream final : public webrtc::AudioSendStream, |
int64_t rtt, |
int64_t probing_interval_ms) override; |
+ // From TransportFeedbackAdapterObserver |
+ void OnPacketAdded(uint32_t ssrc, |
+ uint16_t transport_sequence_number) override; |
+ void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override; |
+ |
const webrtc::AudioSendStream::Config& config() const; |
void SetTransportOverhead(int transport_overhead_per_packet); |
@@ -78,6 +86,11 @@ class AudioSendStream final : public webrtc::AudioSendStream, |
BitrateAllocator* const bitrate_allocator_; |
CongestionController* const congestion_controller_; |
+ // TODO(elad.alon): How come the GUARDED_BY has no effect here? |
sprang_webrtc
2017/02/03 11:57:04
how do you mean?
elad.alon_webrtc.org
2017/02/03 15:54:02
The compiler does not complain - though it should
|
+ rtc::CriticalSection packets_sent_since_last_feedback_cs_; |
+ std::vector<uint16_t> packets_sent_since_last_feedback_ |
+ GUARDED_BY(&packets_sent_since_last_feedback_cs_); |
+ |
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioSendStream); |
}; |
} // namespace internal |