Index: webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc |
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc |
index 53334c6250cf23dab5003a2598efa3e44b1c7122..a8cecb334b4cea35a8507de5535632a7a6a95c3b 100644 |
--- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc |
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc |
@@ -11,6 +11,7 @@ |
#include <utility> |
#include <vector> |
+#include "webrtc/base/fakeclock.h" |
#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h" |
#include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" |
#include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" |
@@ -55,7 +56,6 @@ MATCHER_P(EncoderRuntimeConfigIs, config, "") { |
struct AudioNetworkAdaptorStates { |
std::unique_ptr<AudioNetworkAdaptorImpl> audio_network_adaptor; |
std::vector<std::unique_ptr<MockController>> mock_controllers; |
- std::unique_ptr<SimulatedClock> simulated_clock; |
std::unique_ptr<MockRtcEventLog> event_log; |
MockDebugDumpWriter* mock_debug_dump_writer; |
}; |
@@ -80,7 +80,6 @@ AudioNetworkAdaptorStates CreateAudioNetworkAdaptor() { |
EXPECT_CALL(*controller_manager, GetSortedControllers(_)) |
.WillRepeatedly(Return(controllers)); |
- states.simulated_clock.reset(new SimulatedClock(kClockInitialTimeMs * 1000)); |
states.event_log.reset(new NiceMock<MockRtcEventLog>()); |
auto debug_dump_writer = |
@@ -89,7 +88,6 @@ AudioNetworkAdaptorStates CreateAudioNetworkAdaptor() { |
states.mock_debug_dump_writer = debug_dump_writer.get(); |
AudioNetworkAdaptorImpl::Config config; |
- config.clock = states.simulated_clock.get(); |
config.event_log = states.event_log.get(); |
// AudioNetworkAdaptorImpl governs the lifetime of controller manager. |
states.audio_network_adaptor.reset(new AudioNetworkAdaptorImpl( |
@@ -180,8 +178,9 @@ TEST(AudioNetworkAdaptorImplTest, |
TEST(AudioNetworkAdaptorImplTest, |
DumpEncoderRuntimeConfigIsCalledOnGetEncoderRuntimeConfig) { |
+ rtc::ScopedFakeClock fake_clock; |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(kClockInitialTimeMs)); |
auto states = CreateAudioNetworkAdaptor(); |
- |
AudioEncoderRuntimeConfig config; |
config.bitrate_bps = rtc::Optional<int>(32000); |
config.enable_fec = rtc::Optional<bool>(true); |
@@ -197,6 +196,9 @@ TEST(AudioNetworkAdaptorImplTest, |
TEST(AudioNetworkAdaptorImplTest, |
DumpNetworkMetricsIsCalledOnSetNetworkMetrics) { |
+ rtc::ScopedFakeClock fake_clock; |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(kClockInitialTimeMs)); |
+ |
auto states = CreateAudioNetworkAdaptor(); |
constexpr int kBandwidth = 16000; |
@@ -214,14 +216,14 @@ TEST(AudioNetworkAdaptorImplTest, |
DumpNetworkMetrics(NetworkMetricsIs(check), timestamp_check)); |
states.audio_network_adaptor->SetUplinkBandwidth(kBandwidth); |
- states.simulated_clock->AdvanceTimeMilliseconds(100); |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(100)); |
timestamp_check += 100; |
check.uplink_packet_loss_fraction = rtc::Optional<float>(kPacketLoss); |
EXPECT_CALL(*states.mock_debug_dump_writer, |
DumpNetworkMetrics(NetworkMetricsIs(check), timestamp_check)); |
states.audio_network_adaptor->SetUplinkPacketLossFraction(kPacketLoss); |
- states.simulated_clock->AdvanceTimeMilliseconds(50); |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(50)); |
timestamp_check += 50; |
check.uplink_recoverable_packet_loss_fraction = |
rtc::Optional<float>(kRecoverablePacketLoss); |
@@ -230,21 +232,21 @@ TEST(AudioNetworkAdaptorImplTest, |
states.audio_network_adaptor->SetUplinkRecoverablePacketLossFraction( |
kRecoverablePacketLoss); |
- states.simulated_clock->AdvanceTimeMilliseconds(200); |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(200)); |
timestamp_check += 200; |
check.rtt_ms = rtc::Optional<int>(kRtt); |
EXPECT_CALL(*states.mock_debug_dump_writer, |
DumpNetworkMetrics(NetworkMetricsIs(check), timestamp_check)); |
states.audio_network_adaptor->SetRtt(kRtt); |
- states.simulated_clock->AdvanceTimeMilliseconds(150); |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(150)); |
timestamp_check += 150; |
check.target_audio_bitrate_bps = rtc::Optional<int>(kTargetAudioBitrate); |
EXPECT_CALL(*states.mock_debug_dump_writer, |
DumpNetworkMetrics(NetworkMetricsIs(check), timestamp_check)); |
states.audio_network_adaptor->SetTargetAudioBitrate(kTargetAudioBitrate); |
- states.simulated_clock->AdvanceTimeMilliseconds(50); |
+ fake_clock.AdvanceTime(rtc::TimeDelta::FromMilliseconds(50)); |
timestamp_check += 50; |
check.overhead_bytes_per_packet = rtc::Optional<size_t>(kOverhead); |
EXPECT_CALL(*states.mock_debug_dump_writer, |