44caf01c34
Modify bitrate controller to update bitrate based on process call and not only whenever a RTCP receiver block is received. Additionally: Add condition to only start rampup after a receiver block is received. This was same as old behaviour but now an explicit check is needed to verify process does not ramps up before the first block. Fix logic around capping max bitrate increase at 8% per second. Before it was only increasing once every 1 second and each increase would be as high as 8%. If receiver blocks had a different interval before it would lose an update or waste an update slot and not ramp up as much as a 8% (e.g. if RTCP received < 1 second). Did not touch decrease logic, however since it can be triggered more often it may decrease much faster and closer to the original written cap of once every 300ms + rtt. Note: rampup_tests.cc don't seem to be affected by this since there is no packet loss or REMB that go higher than expected cap. bitrate_controller_unittests.cc are don't really simulate a clock and the process thread, but trigger update by inserting an rtcp block. BUG=3065 R=stefan@webrtc.org, mflodman@webrtc.org git-svn-id: http://webrtc.googlecode.com/svn/trunk@5794 4adac7df-926f-26a2-2b94-8c16560cd09d
135 lines
5.0 KiB
C++
135 lines
5.0 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.
|
|
*
|
|
* Usage: this class will register multiple RtcpBitrateObserver's one at each
|
|
* RTCP module. It will aggregate the results and run one bandwidth estimation
|
|
* and push the result to the encoder via VideoEncoderCallback.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
|
|
#define WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
|
|
|
|
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
|
|
|
|
#include <list>
|
|
#include <map>
|
|
#include <utility>
|
|
|
|
#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
|
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
|
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class BitrateControllerImpl : public BitrateController {
|
|
public:
|
|
BitrateControllerImpl(Clock* clock, bool enforce_min_bitrate);
|
|
virtual ~BitrateControllerImpl();
|
|
|
|
virtual bool AvailableBandwidth(uint32_t* bandwidth) const OVERRIDE;
|
|
|
|
virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() OVERRIDE;
|
|
|
|
virtual void SetBitrateObserver(BitrateObserver* observer,
|
|
const uint32_t start_bitrate,
|
|
const uint32_t min_bitrate,
|
|
const uint32_t max_bitrate) OVERRIDE;
|
|
|
|
virtual void RemoveBitrateObserver(BitrateObserver* observer) OVERRIDE;
|
|
|
|
virtual void EnforceMinBitrate(bool enforce_min_bitrate) OVERRIDE;
|
|
virtual void SetReservedBitrate(uint32_t reserved_bitrate_bps) OVERRIDE;
|
|
|
|
virtual int32_t TimeUntilNextProcess() OVERRIDE;
|
|
virtual int32_t Process() OVERRIDE;
|
|
|
|
private:
|
|
class RtcpBandwidthObserverImpl;
|
|
|
|
struct BitrateConfiguration {
|
|
BitrateConfiguration(uint32_t start_bitrate,
|
|
uint32_t min_bitrate,
|
|
uint32_t max_bitrate)
|
|
: start_bitrate_(start_bitrate),
|
|
min_bitrate_(min_bitrate),
|
|
max_bitrate_(max_bitrate) {
|
|
}
|
|
uint32_t start_bitrate_;
|
|
uint32_t min_bitrate_;
|
|
uint32_t max_bitrate_;
|
|
};
|
|
struct ObserverConfiguration {
|
|
ObserverConfiguration(BitrateObserver* observer,
|
|
uint32_t bitrate)
|
|
: observer_(observer),
|
|
min_bitrate_(bitrate) {
|
|
}
|
|
BitrateObserver* observer_;
|
|
uint32_t min_bitrate_;
|
|
};
|
|
typedef std::pair<BitrateObserver*, BitrateConfiguration*>
|
|
BitrateObserverConfiguration;
|
|
typedef std::list<BitrateObserverConfiguration> BitrateObserverConfList;
|
|
|
|
void UpdateMinMaxBitrate() EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
|
|
|
|
// Called by BitrateObserver's direct from the RTCP module.
|
|
void OnReceivedEstimatedBitrate(const uint32_t bitrate);
|
|
|
|
void OnReceivedRtcpReceiverReport(const uint8_t fraction_loss,
|
|
const uint32_t rtt,
|
|
const int number_of_packets,
|
|
const uint32_t now_ms);
|
|
|
|
void MaybeTriggerOnNetworkChanged() EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
|
|
|
|
void OnNetworkChanged(const uint32_t bitrate,
|
|
const uint8_t fraction_loss, // 0 - 255.
|
|
const uint32_t rtt)
|
|
EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
|
|
|
|
void NormalRateAllocation(uint32_t bitrate,
|
|
uint8_t fraction_loss,
|
|
uint32_t rtt,
|
|
uint32_t sum_min_bitrates)
|
|
EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
|
|
|
|
void LowRateAllocation(uint32_t bitrate,
|
|
uint8_t fraction_loss,
|
|
uint32_t rtt,
|
|
uint32_t sum_min_bitrates)
|
|
EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
|
|
|
|
typedef std::multimap<uint32_t, ObserverConfiguration*> ObserverSortingMap;
|
|
|
|
BitrateObserverConfList::iterator FindObserverConfigurationPair(
|
|
const BitrateObserver* observer) EXCLUSIVE_LOCKS_REQUIRED(*critsect_);
|
|
|
|
// Used by process thread.
|
|
Clock* clock_;
|
|
uint32_t last_bitrate_update_ms_;
|
|
|
|
CriticalSectionWrapper* critsect_;
|
|
SendSideBandwidthEstimation bandwidth_estimation_ GUARDED_BY(*critsect_);
|
|
BitrateObserverConfList bitrate_observers_ GUARDED_BY(*critsect_);
|
|
bool enforce_min_bitrate_ GUARDED_BY(*critsect_);
|
|
uint32_t reserved_bitrate_bps_ GUARDED_BY(*critsect_);
|
|
|
|
uint32_t last_bitrate_bps_ GUARDED_BY(*critsect_);
|
|
uint8_t last_fraction_loss_ GUARDED_BY(*critsect_);
|
|
uint32_t last_rtt_ms_ GUARDED_BY(*critsect_);
|
|
bool last_enforce_min_bitrate_ GUARDED_BY(*critsect_);
|
|
bool bitrate_observers_modified_ GUARDED_BY(*critsect_);
|
|
uint32_t last_reserved_bitrate_bps_ GUARDED_BY(*critsect_);
|
|
|
|
DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl);
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
|