5ec85fbcb7
Reason for revert: Caused issues with webrtc_perf_tests on build bots. Original issue's description: > Fix race / crash in OnNetworkRouteChanged(). > > To achieve this some refactoring was done to make it possible to synchronize > access to the DelayBasedBwe in TransportFeedbackAdapter: > - The callback was removed from DelayBasedBwe, it now instead returns its > result. > - TransportFeedbackAdapter was moved to modules/congestion_controller to avoid > unnecessary dependencies. > > Reenables previously disabled flaky test. Can no longer reproduce flakiness with gtest-parallel and asan/tsan builds. > > BUG=webrtc:6427, webrtc:6422 > > Committed: https://crrev.com/fd0d42669204e6dd92a60736bca7ae0196663024 > Cr-Commit-Position: refs/heads/master@{#14430} TBR=terelius@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6427, webrtc:6422 Review-Url: https://codereview.webrtc.org/2377303002 Cr-Commit-Position: refs/heads/master@{#14433}
109 lines
3.8 KiB
C++
109 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 <utility>
|
|
#include <vector>
|
|
|
|
#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,
|
|
RtcEventLog* event_log);
|
|
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 ResetBitrates(int bitrate_bps,
|
|
int min_bitrate_bps,
|
|
int max_bitrate_bps) override;
|
|
|
|
|
|
void SetReservedBitrate(uint32_t reserved_bitrate_bps) 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;
|
|
|
|
// RemoteBitrateObserver overrides.
|
|
void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
|
|
uint32_t bitrate_bps) override;
|
|
void OnProbeBitrate(uint32_t bitrate_bps) override;
|
|
|
|
int64_t TimeUntilNextProcess() override;
|
|
void Process() override;
|
|
|
|
private:
|
|
class RtcpBandwidthObserverImpl;
|
|
|
|
// Called by BitrateObserver's direct from the RTCP module.
|
|
void OnReceiverEstimatedBitrate(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_;
|
|
RtcEventLog* const event_log_;
|
|
|
|
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_
|