ec81bcd519
This reverts commit e30c27205148b34ba421184efe65f6a0780b436d (https://codereview.webrtc.org/1958053002/) Original reverted cl is in patch set #1. Changes in following patch sets. The cl now also make sure SendPacer starts with the configured bitrate provided in a call to CongestionController::SetBweBitrates)() It turns out that the failing tests in 609816 is due to a bug in the current code that runs the proper at 300kbit regardless of configured start bitrate. Original cl description: Remove SendPacer from ViEEncoder This CL moves the logic where the ViEEncoder pause if the pacer is full to the BitrateController. If the queue is full, the controller reports a bitrate of zero to Call (and BitrateAllocator) BUG=chromium:609816, webrtc:5687 TBR=mflodman@webrtc.org NOTRY=True // Due to bug in android_x86 cq builder.... Review-Url: https://codereview.webrtc.org/1958113003 Cr-Commit-Position: refs/heads/master@{#12688}
99 lines
3.5 KiB
C++
99 lines
3.5 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 <utility>
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class BitrateControllerImpl : public BitrateController {
|
|
public:
|
|
// TODO(perkj): BitrateObserver has been deprecated and is not used in WebRTC.
|
|
// |observer| is left for project that is not yet updated.
|
|
BitrateControllerImpl(Clock* clock, BitrateObserver* observer);
|
|
virtual ~BitrateControllerImpl() {}
|
|
|
|
bool AvailableBandwidth(uint32_t* bandwidth) const override;
|
|
|
|
RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
|
|
|
|
// Deprecated
|
|
void SetStartBitrate(int start_bitrate_bps) override;
|
|
// Deprecated
|
|
void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) override;
|
|
|
|
void SetBitrates(int start_bitrate_bps,
|
|
int min_bitrate_bps,
|
|
int max_bitrate_bps) override;
|
|
|
|
void UpdateDelayBasedEstimate(uint32_t bitrate_bps) override;
|
|
|
|
void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
|
|
|
|
void SetEventLog(RtcEventLog* event_log) override;
|
|
|
|
// Returns true if the parameters have changed since the last call.
|
|
bool GetNetworkParameters(uint32_t* bitrate,
|
|
uint8_t* fraction_loss,
|
|
int64_t* rtt) override;
|
|
|
|
int64_t TimeUntilNextProcess() override;
|
|
void Process() override;
|
|
|
|
private:
|
|
class RtcpBandwidthObserverImpl;
|
|
|
|
// Called by BitrateObserver's direct from the RTCP module.
|
|
void OnReceivedEstimatedBitrate(uint32_t bitrate);
|
|
|
|
void OnReceivedRtcpReceiverReport(uint8_t fraction_loss,
|
|
int64_t rtt,
|
|
int number_of_packets,
|
|
int64_t now_ms);
|
|
|
|
// Deprecated
|
|
void MaybeTriggerOnNetworkChanged();
|
|
|
|
void OnNetworkChanged(uint32_t bitrate,
|
|
uint8_t fraction_loss, // 0 - 255.
|
|
int64_t rtt) EXCLUSIVE_LOCKS_REQUIRED(critsect_);
|
|
|
|
// Used by process thread.
|
|
Clock* const clock_;
|
|
BitrateObserver* const observer_;
|
|
int64_t last_bitrate_update_ms_;
|
|
|
|
rtc::CriticalSection critsect_;
|
|
SendSideBandwidthEstimation bandwidth_estimation_ 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_);
|
|
int64_t last_rtt_ms_ GUARDED_BY(critsect_);
|
|
uint32_t last_reserved_bitrate_bps_ GUARDED_BY(critsect_);
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl);
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
|