a49f1105eb
Reason for revert:
It keeps breaking upstream.
Original issue's description:
> Reland Issue 2061423003: Refactor NACK bitrate allocation
>
> 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
>
> Committed: 05ce4ae31f
TBR=tommi@webrtc.org,sprang@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.webrtc.org/2130423002
Cr-Commit-Position: refs/heads/master@{#13419}
78 lines
1.8 KiB
C++
78 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2012 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_RTP_RTCP_SOURCE_BITRATE_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_BITRATE_H_
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <list>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
|
|
class Bitrate {
|
|
public:
|
|
class Observer;
|
|
Bitrate(Clock* clock, Observer* observer);
|
|
virtual ~Bitrate();
|
|
|
|
// Calculates rates.
|
|
void Process();
|
|
|
|
// Update with a packet.
|
|
void Update(const size_t bytes);
|
|
|
|
// Packet rate last second, updated roughly every 100 ms.
|
|
uint32_t PacketRate() const;
|
|
|
|
// Bitrate last second, updated roughly every 100 ms.
|
|
uint32_t BitrateLast() const;
|
|
|
|
// Bitrate last second, updated now.
|
|
uint32_t BitrateNow() const;
|
|
|
|
int64_t time_last_rate_update() const;
|
|
|
|
class Observer {
|
|
public:
|
|
Observer() {}
|
|
virtual ~Observer() {}
|
|
|
|
virtual void BitrateUpdated(const BitrateStatistics& stats) = 0;
|
|
};
|
|
|
|
protected:
|
|
Clock* clock_;
|
|
|
|
private:
|
|
rtc::CriticalSection crit_;
|
|
uint32_t packet_rate_;
|
|
uint32_t bitrate_;
|
|
uint8_t bitrate_next_idx_;
|
|
int64_t packet_rate_array_[10];
|
|
int64_t bitrate_array_[10];
|
|
int64_t bitrate_diff_ms_[10];
|
|
int64_t time_last_rate_update_;
|
|
size_t bytes_count_;
|
|
uint32_t packet_count_;
|
|
Observer* const observer_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BITRATE_H_
|