cd349d9743
Reason for revert:
Upstream fixes in place, should be OK now.
Original issue's description:
> Revert of Refactor NACK bitrate allocation (patchset #16 id:300001 of https://codereview.webrtc.org/2061423003/ )
>
> Reason for revert:
> Breaks upstream code.
>
> Original issue's description:
> > Refactor NACK bitrate allocation
> >
> > Nack bitrate allocation should not be done on a per-rtp-module basis,
> > but rather shared bitrate pool per call. This CL moves allocation to the
> > pacer and cleans up a bunch if bitrate stats handling.
> >
> > BUG=
> > R=danilchap@webrtc.org, stefan@webrtc.org, tommi@webrtc.org
> >
> > Committed: 5fc59e810b
>
> TBR=tommi@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=
>
> Committed: https://crrev.com/e5dd44101eca485f5ad12e5f7ce6f6b0d204116b
> Cr-Commit-Position: refs/heads/master@{#13417}
TBR=tommi@webrtc.org,danilchap@webrtc.org,stefan@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=
Review-Url: https://codereview.webrtc.org/2146013002
Cr-Commit-Position: refs/heads/master@{#13465}
57 lines
1.8 KiB
C++
57 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2016 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_BASE_RATE_LIMITER_H_
|
|
#define WEBRTC_BASE_RATE_LIMITER_H_
|
|
|
|
#include <limits>
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/rate_statistics.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
|
|
// Class used to limit a bitrate, making sure the average does not exceed a
|
|
// maximum as measured over a sliding window. This class is thread safe; all
|
|
// methods will acquire (the same) lock befeore executing.
|
|
class RateLimiter {
|
|
public:
|
|
RateLimiter(Clock* clock, int64_t max_window_ms);
|
|
~RateLimiter();
|
|
|
|
// Try to use rate to send bytes. Returns true on success and if so updates
|
|
// current rate.
|
|
bool TryUseRate(size_t packet_size_bytes);
|
|
|
|
// Set the maximum bitrate, in bps, that this limiter allows to send.
|
|
void SetMaxRate(uint32_t max_rate_bps);
|
|
|
|
// Set the window size over which to measure the current bitrate.
|
|
// For example, irt retransmissions, this is typically the RTT.
|
|
// Returns true on success and false if window_size_ms is out of range.
|
|
bool SetWindowSize(int64_t window_size_ms);
|
|
|
|
private:
|
|
Clock* const clock_;
|
|
rtc::CriticalSection lock_;
|
|
RateStatistics current_rate_ GUARDED_BY(lock_);
|
|
int64_t window_size_ms_ GUARDED_BY(lock_);
|
|
uint32_t max_rate_bps_ GUARDED_BY(lock_);
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RateLimiter);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_BASE_RATE_LIMITER_H_
|