29dd0de5b3
This CL implements an alternative to the bitrate clamping that is done in BitrateControllerImpl. The default behavior is unchanged, but if the new algorithm is enabled the behavior is as follows: When the new bitrate is lower than the sum of min bitrates, the algorithm will give each observer up to its min bitrate, one observer at a time, until the bitrate budget is depleted. Thus, with this change, some observers may get less than their min bitrate, or even zero. Unit tests are implemented. Also fixing two old lint warnings in the affected files. This change is related to the auto-muter feature. BUG=2436 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2439005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5007 4adac7df-926f-26a2-2b94-8c16560cd09d
104 lines
3.8 KiB
C++
104 lines
3.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.
|
|
*
|
|
* 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"
|
|
|
|
namespace webrtc {
|
|
|
|
class RtcpBandwidthObserverImpl;
|
|
|
|
class BitrateControllerImpl : public BitrateController {
|
|
public:
|
|
friend class RtcpBandwidthObserverImpl;
|
|
|
|
explicit BitrateControllerImpl();
|
|
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;
|
|
|
|
protected:
|
|
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;
|
|
|
|
// 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);
|
|
|
|
SendSideBandwidthEstimation bandwidth_estimation_;
|
|
BitrateObserverConfList bitrate_observers_;
|
|
|
|
private:
|
|
typedef std::multimap<uint32_t, ObserverConfiguration*> ObserverSortingMap;
|
|
|
|
BitrateObserverConfList::iterator
|
|
FindObserverConfigurationPair(const BitrateObserver* observer);
|
|
void OnNetworkChanged(const uint32_t bitrate,
|
|
const uint8_t fraction_loss, // 0 - 255.
|
|
const uint32_t rtt);
|
|
// Derived classes must implement this strategy method.
|
|
virtual void LowRateAllocation(uint32_t bitrate,
|
|
uint8_t fraction_loss,
|
|
uint32_t rtt,
|
|
uint32_t sum_min_bitrates) = 0;
|
|
|
|
CriticalSectionWrapper* critsect_;
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
|