zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes all const Clock*.

Browse Source 
This prepares for making the Clock interface fully mutable.

Calls to the time functions in Clock can have side effects in some
circumstances. It's also questionable if it's a good idea to allow
repeated calls to a const method return different values without
any changed to the class instance.

Bug: webrtc:9883
Change-Id: I96fb9230705f7c80a4c0702132fd9dc73899fc5e
Reviewed-on: https://webrtc-review.googlesource.com/c/120347
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26467}
This commit is contained in:
Sebastian Jansson
2019-01-30 11:28:59 +01:00
committed by Commit Bot
parent 15df2ef2c0
commit aa01f27667
32 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
call/rtp_transport_controller_send.cc
View File

@ -35,7 +35,7 @@ constexpr TimeDelta kPacerQueueUpdateInterval = TimeDelta::Millis<25>();
TargetRateConstraints ConvertConstraints(int min_bitrate_bps,
int max_bitrate_bps,
int start_bitrate_bps,
const Clock* clock) {
Clock* clock) {
TargetRateConstraints msg;
msg.at_time = Timestamp::ms(clock->TimeInMilliseconds());
msg.min_data_rate =
@ -48,7 +48,7 @@ TargetRateConstraints ConvertConstraints(int min_bitrate_bps,
}
TargetRateConstraints ConvertConstraints(const BitrateConstraints& contraints,
const Clock* clock) {
Clock* clock) {
return ConvertConstraints(contraints.min_bitrate_bps,
contraints.max_bitrate_bps,
contraints.start_bitrate_bps, clock);

2
call/rtp_transport_controller_send.h
View File

@ -133,7 +133,7 @@ class RtpTransportControllerSend final
void PostUpdates(NetworkControlUpdate update) RTC_RUN_ON(task_queue_);
void UpdateControlState() RTC_RUN_ON(task_queue_);
const Clock* const clock_;
Clock* const clock_;
PacketRouter packet_router_;
std::vector<std::unique_ptr<RtpVideoSenderInterface>> video_rtp_senders_;
PacedSender pacer_;

2
modules/audio_coding/acm2/acm_receiver.h
View File

@ -201,7 +201,7 @@ class AcmReceiver {
std::unique_ptr<int16_t[]> last_audio_buffer_ RTC_GUARDED_BY(crit_sect_);
CallStatistics call_stats_ RTC_GUARDED_BY(crit_sect_);
const std::unique_ptr<NetEq> neteq_; // NetEq is thread-safe; no lock needed.
const Clock* const clock_;
Clock* const clock_;
bool resampled_last_output_frame_ RTC_GUARDED_BY(crit_sect_);
};

6
modules/bitrate_controller/bitrate_controller_impl.cc
View File

@ -54,19 +54,19 @@ class BitrateControllerImpl::RtcpBandwidthObserverImpl
};
BitrateController* BitrateController::CreateBitrateController(
const Clock* clock,
Clock* clock,
BitrateObserver* observer,
RtcEventLog* event_log) {
return new BitrateControllerImpl(clock, observer, event_log);
}
BitrateController* BitrateController::CreateBitrateController(
const Clock* clock,
Clock* clock,
RtcEventLog* event_log) {
return CreateBitrateController(clock, nullptr, event_log);
}
BitrateControllerImpl::BitrateControllerImpl(const Clock* clock,
BitrateControllerImpl::BitrateControllerImpl(Clock* clock,
BitrateObserver* observer,
RtcEventLog* event_log)
: clock_(clock),

4
modules/bitrate_controller/bitrate_controller_impl.h
View File

@ -32,7 +32,7 @@ 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(const Clock* clock,
BitrateControllerImpl(Clock* clock,
BitrateObserver* observer,
RtcEventLog* event_log);
virtual ~BitrateControllerImpl() {}
@ -83,7 +83,7 @@ class BitrateControllerImpl : public BitrateController {
int64_t rtt) RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
// Used by process thread.
const Clock* const clock_;
Clock* const clock_;
BitrateObserver* const observer_;
int64_t last_bitrate_update_ms_;
RtcEventLog* const event_log_;

4
modules/bitrate_controller/include/bitrate_controller.h
View File

@ -62,11 +62,11 @@ class BitrateController : public Module, public RtcpBandwidthObserver {
// Deprecated:
// TODO(perkj): BitrateObserver has been deprecated and is not used in WebRTC.
// Remove this method once other other projects does not use it.
static BitrateController* CreateBitrateController(const Clock* clock,
static BitrateController* CreateBitrateController(Clock* clock,
BitrateObserver* observer,
RtcEventLog* event_log);
static BitrateController* CreateBitrateController(const Clock* clock,
static BitrateController* CreateBitrateController(Clock* clock,
RtcEventLog* event_log);
~BitrateController() override {}

8
modules/congestion_controller/include/receive_side_congestion_controller.h
View File

@ -30,8 +30,7 @@ class RemoteBitrateObserver;
class ReceiveSideCongestionController : public CallStatsObserver,
public Module {
public:
ReceiveSideCongestionController(const Clock* clock,
PacketRouter* packet_router);
ReceiveSideCongestionController(Clock* clock, PacketRouter* packet_router);
~ReceiveSideCongestionController() override {}
@ -57,8 +56,7 @@ class ReceiveSideCongestionController : public CallStatsObserver,
private:
class WrappingBitrateEstimator : public RemoteBitrateEstimator {
public:
WrappingBitrateEstimator(RemoteBitrateObserver* observer,
const Clock* clock);
WrappingBitrateEstimator(RemoteBitrateObserver* observer, Clock* clock);
~WrappingBitrateEstimator() override;
@ -84,7 +82,7 @@ class ReceiveSideCongestionController : public CallStatsObserver,
RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
void PickEstimator() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
RemoteBitrateObserver* observer_;
const Clock* const clock_;
Clock* const clock_;
rtc::CriticalSection crit_sect_;
std::unique_ptr<RemoteBitrateEstimator> rbe_;
bool using_absolute_send_time_;

4
modules/congestion_controller/include/send_side_congestion_controller.h
View File

@ -51,7 +51,7 @@ class DEPRECATED_SendSideCongestionController
public:
using Observer = NetworkChangedObserver;
DEPRECATED_SendSideCongestionController(
const Clock* clock,
Clock* clock,
Observer* observer,
RtcEventLog* event_log,
PacedSender* pacer,
@ -140,7 +140,7 @@ class DEPRECATED_SendSideCongestionController
RTC_EXCLUSIVE_LOCKS_REQUIRED(&probe_lock_);
const FieldTrialBasedConfig field_trial_config_;
const WebRtcKeyValueConfig* const key_value_config_;
const Clock* const clock_;
Clock* const clock_;
rtc::CriticalSection observer_lock_;
Observer* observer_ RTC_GUARDED_BY(observer_lock_);
RtcEventLog* const event_log_;

5
modules/congestion_controller/receive_side_congestion_controller.cc
View File

@ -23,8 +23,7 @@ static const uint32_t kTimeOffsetSwitchThreshold = 30;
} // namespace
ReceiveSideCongestionController::WrappingBitrateEstimator::
WrappingBitrateEstimator(RemoteBitrateObserver* observer,
const Clock* clock)
WrappingBitrateEstimator(RemoteBitrateObserver* observer, Clock* clock)
: observer_(observer),
clock_(clock),
rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_)),
@ -120,7 +119,7 @@ void ReceiveSideCongestionController::WrappingBitrateEstimator::
}
ReceiveSideCongestionController::ReceiveSideCongestionController(
const Clock* clock,
Clock* clock,
PacketRouter* packet_router)
: remote_bitrate_estimator_(packet_router, clock),
remote_estimator_proxy_(clock, packet_router) {}

2
modules/congestion_controller/send_side_congestion_controller.cc
View File

@ -84,7 +84,7 @@ bool IsPacerPushbackExperimentEnabled(
DEPRECATED_SendSideCongestionController::
DEPRECATED_SendSideCongestionController(
const Clock* clock,
Clock* clock,
Observer* observer,
RtcEventLog* event_log,
PacedSender* pacer,

3
modules/congestion_controller/transport_feedback_adapter.cc
View File

@ -29,8 +29,7 @@ const int64_t kBaseTimestampScaleFactor =
rtcp::TransportFeedback::kDeltaScaleFactor * (1 << 8);
const int64_t kBaseTimestampRangeSizeUs = kBaseTimestampScaleFactor * (1 << 24);
LegacyTransportFeedbackAdapter::LegacyTransportFeedbackAdapter(
const Clock* clock)
LegacyTransportFeedbackAdapter::LegacyTransportFeedbackAdapter(Clock* clock)
: send_time_history_(kSendTimeHistoryWindowMs),
clock_(clock),
current_offset_ms_(kNoTimestamp),

4
modules/congestion_controller/transport_feedback_adapter.h
View File

@ -33,7 +33,7 @@ class TransportFeedback;
// modules/congeestion_controller/rtp/transport_feedback_adapter.h
class LegacyTransportFeedbackAdapter {
public:
explicit LegacyTransportFeedbackAdapter(const Clock* clock);
explicit LegacyTransportFeedbackAdapter(Clock* clock);
virtual ~LegacyTransportFeedbackAdapter();
void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
@ -64,7 +64,7 @@ class LegacyTransportFeedbackAdapter {
rtc::CriticalSection lock_;
SendTimeHistory send_time_history_ RTC_GUARDED_BY(&lock_);
const Clock* const clock_;
Clock* const clock_;
int64_t current_offset_ms_;
int64_t last_timestamp_us_;
std::vector<PacketFeedback> last_packet_feedback_vector_;

2
modules/pacing/paced_sender.cc
View File

@ -42,7 +42,7 @@ namespace webrtc {
const int64_t PacedSender::kMaxQueueLengthMs = 2000;
const float PacedSender::kDefaultPaceMultiplier = 2.5f;
PacedSender::PacedSender(const Clock* clock,
PacedSender::PacedSender(Clock* clock,
PacketSender* packet_sender,
RtcEventLog* event_log)
: clock_(clock),

4
modules/pacing/paced_sender.h
View File

@ -68,7 +68,7 @@ class PacedSender : public Pacer {
// overshoots from the encoder.
static const float kDefaultPaceMultiplier;
PacedSender(const Clock* clock,
PacedSender(Clock* clock,
PacketSender* packet_sender,
RtcEventLog* event_log);
@ -168,7 +168,7 @@ class PacedSender : public Pacer {
bool Congested() const RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
int64_t TimeMilliseconds() const RTC_EXCLUSIVE_LOCKS_REQUIRED(critsect_);
const Clock* const clock_;
Clock* const clock_;
PacketSender* const packet_sender_;
std::unique_ptr<AlrDetector> alr_detector_ RTC_PT_GUARDED_BY(critsect_);

2
modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
View File

@ -90,7 +90,7 @@ void RemoteBitrateEstimatorAbsSendTime::AddCluster(std::list<Cluster>* clusters,
RemoteBitrateEstimatorAbsSendTime::RemoteBitrateEstimatorAbsSendTime(
RemoteBitrateObserver* observer,
const Clock* clock)
Clock* clock)
: clock_(clock),
observer_(observer),
inter_arrival_(),

4
modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
View File

@ -73,7 +73,7 @@ struct Cluster {
class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator {
public:
RemoteBitrateEstimatorAbsSendTime(RemoteBitrateObserver* observer,
const Clock* clock);
Clock* clock);
~RemoteBitrateEstimatorAbsSendTime() override;
void IncomingPacket(int64_t arrival_time_ms,
@ -120,7 +120,7 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator {
void TimeoutStreams(int64_t now_ms) RTC_EXCLUSIVE_LOCKS_REQUIRED(&crit_);
rtc::RaceChecker network_race_;
const Clock* const clock_;
Clock* const clock_;
RemoteBitrateObserver* const observer_;
std::unique_ptr<InterArrival> inter_arrival_;
std::unique_ptr<OveruseEstimator> estimator_;

2
modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
View File

@ -59,7 +59,7 @@ struct RemoteBitrateEstimatorSingleStream::Detector {
RemoteBitrateEstimatorSingleStream::RemoteBitrateEstimatorSingleStream(
RemoteBitrateObserver* observer,
const Clock* clock)
Clock* clock)
: clock_(clock),
incoming_bitrate_(kBitrateWindowMs, 8000),
last_valid_incoming_bitrate_(0),

4
modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
View File

@ -32,7 +32,7 @@ struct RTPHeader;
class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator {
public:
RemoteBitrateEstimatorSingleStream(RemoteBitrateObserver* observer,
const Clock* clock);
Clock* clock);
~RemoteBitrateEstimatorSingleStream() override;
void IncomingPacket(int64_t arrival_time_ms,
@ -62,7 +62,7 @@ class RemoteBitrateEstimatorSingleStream : public RemoteBitrateEstimator {
// otherwise creates it.
AimdRateControl* GetRemoteRate() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
const Clock* const clock_;
Clock* const clock_;
SsrcOveruseEstimatorMap overuse_detectors_ RTC_GUARDED_BY(crit_sect_);
RateStatistics incoming_bitrate_ RTC_GUARDED_BY(crit_sect_);
uint32_t last_valid_incoming_bitrate_ RTC_GUARDED_BY(crit_sect_);

2
modules/remote_bitrate_estimator/remote_estimator_proxy.cc
View File

@ -33,7 +33,7 @@ static constexpr int64_t kMaxTimeMs =
std::numeric_limits<int64_t>::max() / 1000;
RemoteEstimatorProxy::RemoteEstimatorProxy(
const Clock* clock,
Clock* clock,
TransportFeedbackSenderInterface* feedback_sender)
: clock_(clock),
feedback_sender_(feedback_sender),

4
modules/remote_bitrate_estimator/remote_estimator_proxy.h
View File

@ -32,7 +32,7 @@ class TransportFeedback;
class RemoteEstimatorProxy : public RemoteBitrateEstimator {
public:
RemoteEstimatorProxy(const Clock* clock,
RemoteEstimatorProxy(Clock* clock,
TransportFeedbackSenderInterface* feedback_sender);
~RemoteEstimatorProxy() override;
@ -58,7 +58,7 @@ class RemoteEstimatorProxy : public RemoteBitrateEstimator {
RTC_EXCLUSIVE_LOCKS_REQUIRED(&lock_);
bool BuildFeedbackPacket(rtcp::TransportFeedback* feedback_packet);
const Clock* const clock_;
Clock* const clock_;
TransportFeedbackSenderInterface* const feedback_sender_;
int64_t last_process_time_ms_;

2
modules/remote_bitrate_estimator/test/bbr_paced_sender.cc
View File

@ -19,7 +19,7 @@
namespace webrtc {
BbrPacedSender::BbrPacedSender(const Clock* clock,
BbrPacedSender::BbrPacedSender(Clock* clock,
PacedSender::PacketSender* packet_sender,
RtcEventLog* event_log)
: clock_(clock),

4
modules/remote_bitrate_estimator/test/bbr_paced_sender.h
View File

@ -53,7 +53,7 @@ class RtcEventLog;
struct Packet;
class BbrPacedSender : public Pacer {
public:
BbrPacedSender(const Clock* clock,
BbrPacedSender(Clock* clock,
PacedSender::PacketSender* packet_sender,
RtcEventLog* event_log);
~BbrPacedSender() override;
@ -75,7 +75,7 @@ class BbrPacedSender : public Pacer {
bool TryToSendPacket(Packet* packet);
private:
const Clock* const clock_;
Clock* const clock_;
PacedSender::PacketSender* const packet_sender_;
uint32_t estimated_bitrate_bps_;
uint32_t min_send_bitrate_kbps_;

4
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -323,7 +323,7 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
RTCPReceiver* rtcp_receiver() { return &rtcp_receiver_; }
const RTCPReceiver* rtcp_receiver() const { return &rtcp_receiver_; }
const Clock* clock() const { return clock_; }
Clock* clock() const { return clock_; }
private:
FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, Rtt);
@ -339,7 +339,7 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
RTCPSender rtcp_sender_;
RTCPReceiver rtcp_receiver_;
const Clock* const clock_;
Clock* const clock_;
const bool audio_;

2
modules/video_coding/jitter_estimator.cc
View File

@ -32,7 +32,7 @@ static constexpr int64_t kNackCountTimeoutMs = 60000;
static constexpr double kDefaultMaxTimestampDeviationInSigmas = 3.5;
} // namespace
VCMJitterEstimator::VCMJitterEstimator(const Clock* clock,
VCMJitterEstimator::VCMJitterEstimator(Clock* clock,
int32_t vcmId,
int32_t receiverId)
: _vcmId(vcmId),

4
modules/video_coding/jitter_estimator.h
View File

@ -20,7 +20,7 @@ class Clock;
class VCMJitterEstimator {
public:
VCMJitterEstimator(const Clock* clock,
explicit VCMJitterEstimator(Clock* clock,
int32_t vcmId = 0,
int32_t receiverId = 0);
virtual ~VCMJitterEstimator();
@ -158,7 +158,7 @@ class VCMJitterEstimator {
rtc::RollingAccumulator<uint64_t> fps_counter_;
const double time_deviation_upper_bound_;
const Clock* clock_;
Clock* clock_;
};
} // namespace webrtc

2
rtc_base/rate_limiter.cc
View File

@ -17,7 +17,7 @@
namespace webrtc {
RateLimiter::RateLimiter(const Clock* clock, int64_t max_window_ms)
RateLimiter::RateLimiter(Clock* clock, int64_t max_window_ms)
: clock_(clock),
current_rate_(max_window_ms, RateStatistics::kBpsScale),
window_size_ms_(max_window_ms),

4
rtc_base/rate_limiter.h
View File

@ -28,7 +28,7 @@ class Clock;
// methods will acquire (the same) lock befeore executing.
class RateLimiter {
public:
RateLimiter(const Clock* clock, int64_t max_window_ms);
RateLimiter(Clock* clock, int64_t max_window_ms);
~RateLimiter();
// Try to use rate to send bytes. Returns true on success and if so updates
@ -44,7 +44,7 @@ class RateLimiter {
bool SetWindowSize(int64_t window_size_ms);
private:
const Clock* const clock_;
Clock* const clock_;
rtc::CriticalSection lock_;
RateStatistics current_rate_ RTC_GUARDED_BY(lock_);
int64_t window_size_ms_ RTC_GUARDED_BY(lock_);

1
test/frame_generator_capturer.h
View File

@ -59,6 +59,7 @@ class FrameGeneratorCapturer : public TestVideoCapturer {
int frame_repeat_count,
int target_fps,
Clock* clock);
static FrameGeneratorCapturer* Create(
std::unique_ptr<FrameGenerator> frame_generator,
int target_fps,

2
test/scenario/network_node.cc
View File

@ -78,7 +78,7 @@ SimulationNode::SimulationNode(
simulated_network_(simulation),
config_(config) {}
NetworkNodeTransport::NetworkNodeTransport(const Clock* sender_clock,
NetworkNodeTransport::NetworkNodeTransport(Clock* sender_clock,
Call* sender_call)
: sender_clock_(sender_clock), sender_call_(sender_call) {}

4
test/scenario/network_node.h
View File

@ -66,7 +66,7 @@ class SimulationNode : public EmulatedNetworkNode {
class NetworkNodeTransport : public Transport {
public:
NetworkNodeTransport(const Clock* sender_clock, Call* sender_call);
NetworkNodeTransport(Clock* sender_clock, Call* sender_call);
~NetworkNodeTransport() override;
bool SendRtp(const uint8_t* packet,
@ -85,7 +85,7 @@ class NetworkNodeTransport : public Transport {
private:
rtc::CriticalSection crit_sect_;
const Clock* const sender_clock_;
Clock* const sender_clock_;
Call* const sender_call_;
EmulatedNetworkNode* send_net_ RTC_GUARDED_BY(crit_sect_) = nullptr;
uint64_t receiver_id_ RTC_GUARDED_BY(crit_sect_) = 0;

2
test/scenario/quality_stats.cc
View File

@ -134,7 +134,7 @@ void VideoQualityStats::HandleFrameInfo(VideoFrameQualityInfo sample) {
}
ForwardingCapturedFrameTap::ForwardingCapturedFrameTap(
const Clock* clock,
Clock* clock,
VideoQualityAnalyzer* analyzer,
rtc::VideoSourceInterface<VideoFrame>* source)
: clock_(clock), analyzer_(analyzer), source_(source) {}

6
test/scenario/quality_stats.h
View File

@ -41,7 +41,7 @@ class VideoQualityAnalyzer {
void OnDecodedFrame(const VideoFrame& frame);
void Synchronize();
bool Active() const;
const Clock* clock();
Clock* clock();
private:
int64_t DecodedFrameCaptureTimeOffsetMs(const VideoFrame& decoded) const;
@ -73,7 +73,7 @@ class ForwardingCapturedFrameTap
: public rtc::VideoSinkInterface<VideoFrame>,
public rtc::VideoSourceInterface<VideoFrame> {
public:
ForwardingCapturedFrameTap(const Clock* clock,
ForwardingCapturedFrameTap(Clock* clock,
VideoQualityAnalyzer* analyzer,
rtc::VideoSourceInterface<VideoFrame>* source);
ForwardingCapturedFrameTap(ForwardingCapturedFrameTap&) = delete;
@ -91,7 +91,7 @@ class ForwardingCapturedFrameTap
VideoFrame PopFrame();
private:
const Clock* clock_;
Clock* const clock_;
VideoQualityAnalyzer* const analyzer_;
rtc::VideoSourceInterface<VideoFrame>* const source_;
VideoSinkInterface<VideoFrame>* sink_;