zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland Issue 2061423003: Refactor NACK bitrate allocation

Browse Source 
This is a reland of https://codereview.webrtc.org/2061423003/
Which was reverted in https://codereview.webrtc.org/2131913003/

The reason for the revert was that some upstream code used
RtpSender::SetTargetBitrate(). I've added that back as a no-op until we
it's been brought up to date.

TBR=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/2131313002 .

Cr-Commit-Position: refs/heads/master@{#13418}
This commit is contained in:
Erik Språng
2016-07-08 19:11:10 +02:00
parent e5dd44101e
commit 05ce4ae31f
40 changed files with 604 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/rtp_rtcp/include/receive_statistics.h
View File

@ -46,7 +46,7 @@ class StreamStatistician {
typedef std::map<uint32_t, StreamStatistician*> StatisticianMap;
class ReceiveStatistics : public Module {
class ReceiveStatistics {
public:
virtual ~ReceiveStatistics() {}
@ -89,8 +89,6 @@ class NullReceiveStatistics : public ReceiveStatistics {
size_t packet_length) override;
StatisticianMap GetActiveStatisticians() const override;
StreamStatistician* GetStatistician(uint32_t ssrc) const override;
int64_t TimeUntilNextProcess() override;
void Process() override;
void SetMaxReorderingThreshold(int max_reordering_threshold) override;
void RegisterRtcpStatisticsCallback(
RtcpStatisticsCallback* callback) override;

9
webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
View File

@ -23,11 +23,12 @@
namespace webrtc {
// Forward declarations.
class RateLimiter;
class ReceiveStatistics;
class RemoteBitrateEstimator;
class RtcEventLog;
class RtpReceiver;
class Transport;
class RtcEventLog;
RTPExtensionType StringToRtpExtensionType(const std::string& extension);
@ -79,6 +80,7 @@ class RtpRtcp : public Module {
SendSideDelayObserver* send_side_delay_observer;
RtcEventLog* event_log;
SendPacketObserver* send_packet_observer;
RateLimiter* retransmission_rate_limiter;
RTC_DISALLOW_COPY_AND_ASSIGN(Configuration);
};
@ -615,11 +617,6 @@ class RtpRtcp : public Module {
*
***************************************************************************/
/*
* Set the target send bitrate
*/
virtual void SetTargetSendBitrate(uint32_t bitrate_bps) = 0;
/*
* Turn on/off generic FEC
*/