9e117c5e1b
Reason for revert: Reland Original issue's description: > Revert of Add functionality which limits the number of bytes on the network. (patchset #26 id:500001 of https://codereview.webrtc.org/2918323002/ ) > > Reason for revert: > Speculative revert to see if this caused regressions in android perf tests. > > Original issue's description: > > Add functionality which limits the number of bytes on the network. > > > > The limit is based on the bandwidth delay product, but also adds some additional slack to compensate for the sawtooth-like BWE pattern and the slowness of the encoder rate control. The delay is estimated based on the time from sending a packet until an ack is received. Since acks are received in bursts (feedback is only sent periodically), a min filter is used to estimate the rtt. > > > > Whenever the in flight bytes reaches the congestion window, the pacer is paused, which in turn will result in send-side queues growing. Eventually the encoders will be paused as the pacer queue grows large (currently 2 seconds). > > > > BUG=webrtc:7926 > > > > Review-Url: https://codereview.webrtc.org/2918323002 > > Cr-Commit-Position: refs/heads/master@{#19289} > > Committed:8497fdde43> > TBR=terelius@webrtc.org,philipel@webrtc.org,tschumim@webrtc.org,gnish@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7926 > > Review-Url: https://codereview.webrtc.org/3001653002 > Cr-Commit-Position: refs/heads/master@{#19339} > Committed:64136af364TBR=terelius@webrtc.org,philipel@webrtc.org,tschumim@webrtc.org,gnish@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7926 Review-Url: https://codereview.webrtc.org/2994343002 Cr-Commit-Position: refs/heads/master@{#19373}
82 lines
2.9 KiB
C++
82 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|
|
#define WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|
|
|
|
#include <deque>
|
|
#include <vector>
|
|
|
|
#include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
|
|
#include "webrtc/rtc_base/criticalsection.h"
|
|
#include "webrtc/rtc_base/thread_annotations.h"
|
|
#include "webrtc/rtc_base/thread_checker.h"
|
|
#include "webrtc/system_wrappers/include/clock.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class PacketFeedbackObserver;
|
|
|
|
namespace rtcp {
|
|
class TransportFeedback;
|
|
} // namespace rtcp
|
|
|
|
class TransportFeedbackAdapter {
|
|
public:
|
|
explicit TransportFeedbackAdapter(const Clock* clock);
|
|
virtual ~TransportFeedbackAdapter();
|
|
|
|
void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
|
|
void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
|
|
|
|
void AddPacket(uint32_t ssrc,
|
|
uint16_t sequence_number,
|
|
size_t length,
|
|
const PacedPacketInfo& pacing_info);
|
|
void OnSentPacket(uint16_t sequence_number, int64_t send_time_ms);
|
|
|
|
// TODO(holmer): This method should return DelayBasedBwe::Result so that we
|
|
// can get rid of the dependency on BitrateController. Requires changes
|
|
// to the CongestionController interface.
|
|
void OnTransportFeedback(const rtcp::TransportFeedback& feedback);
|
|
std::vector<PacketFeedback> GetTransportFeedbackVector() const;
|
|
rtc::Optional<int64_t> GetMinFeedbackLoopRtt() const;
|
|
|
|
void SetTransportOverhead(int transport_overhead_bytes_per_packet);
|
|
|
|
void SetNetworkIds(uint16_t local_id, uint16_t remote_id);
|
|
|
|
size_t GetOutstandingBytes() const;
|
|
|
|
private:
|
|
std::vector<PacketFeedback> GetPacketFeedbackVector(
|
|
const rtcp::TransportFeedback& feedback);
|
|
|
|
const bool send_side_bwe_with_overhead_;
|
|
rtc::CriticalSection lock_;
|
|
int transport_overhead_bytes_per_packet_ GUARDED_BY(&lock_);
|
|
SendTimeHistory send_time_history_ GUARDED_BY(&lock_);
|
|
const Clock* const clock_;
|
|
int64_t current_offset_ms_;
|
|
int64_t last_timestamp_us_;
|
|
std::vector<PacketFeedback> last_packet_feedback_vector_;
|
|
uint16_t local_net_id_ GUARDED_BY(&lock_);
|
|
uint16_t remote_net_id_ GUARDED_BY(&lock_);
|
|
std::deque<int64_t> feedback_rtts_ GUARDED_BY(&lock_);
|
|
rtc::Optional<int64_t> min_feedback_rtt_ GUARDED_BY(&lock_);
|
|
|
|
rtc::CriticalSection observers_lock_;
|
|
std::vector<PacketFeedbackObserver*> observers_ GUARDED_BY(&observers_lock_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_
|