14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
92 lines
3.3 KiB
C++
92 lines
3.3 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/scoped_ptr.h"
|
|
#include "webrtc/modules/bitrate_controller/remb_suppressor.h"
|
|
#include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h"
|
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class BitrateControllerImpl : public BitrateController {
|
|
public:
|
|
BitrateControllerImpl(Clock* clock, BitrateObserver* observer);
|
|
virtual ~BitrateControllerImpl();
|
|
|
|
bool AvailableBandwidth(uint32_t* bandwidth) const override;
|
|
|
|
RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
|
|
|
|
void SetStartBitrate(int start_bitrate_bps) override;
|
|
void SetMinMaxBitrate(int min_bitrate_bps,
|
|
int max_bitrate_bps) override;
|
|
|
|
void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
|
|
|
|
int64_t TimeUntilNextProcess() override;
|
|
int32_t Process() override;
|
|
|
|
// Current bitrate actually being sent.
|
|
void SetBitrateSent(uint32_t bitrate_sent_bps) override;
|
|
|
|
void SetCodecMode(webrtc::VideoCodecMode mode) 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);
|
|
|
|
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* clock_;
|
|
BitrateObserver* observer_;
|
|
int64_t last_bitrate_update_ms_;
|
|
|
|
CriticalSectionWrapper* critsect_;
|
|
SendSideBandwidthEstimation bandwidth_estimation_ 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_);
|
|
int64_t last_rtt_ms_ GUARDED_BY(*critsect_);
|
|
bool last_enforce_min_bitrate_ GUARDED_BY(*critsect_);
|
|
uint32_t last_reserved_bitrate_bps_ GUARDED_BY(*critsect_);
|
|
rtc::scoped_ptr<RembSuppressor> remb_suppressor_ GUARDED_BY(*critsect_);
|
|
|
|
DISALLOW_IMPLICIT_CONSTRUCTORS(BitrateControllerImpl);
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_BITRATE_CONTROLLER_BITRATE_CONTROLLER_IMPL_H_
|