mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up misc TimeDelta use

Browse source 
follow-up from https://webrtc-review.googlesource.com/c/src/+/262810

* replace Time::Millis(0) and TimeDelta::Millis(0) with ::Zero()
* drop unnecessary webrtc namespace from some TimeDeltas
* make TimeDelta do the unit conversion for stats

BUG=webrtc:13756

Change-Id: Ic60625ae0fc7959a47a6be9f5051851feaf76373
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265875
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37664}
This commit is contained in:
Philipp Hancke 2022-07-08 18:43:25 +02:00 committed by WebRTC LUCI CQ
parent 175d77ce77
commit a204ad210d
23 changed files with 155 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
api/rtp_packet_info_unittest.cc
View file

@ -37,7 +37,7 @@ TEST(RtpPacketInfoTest, Ssrc) {
rhs = RtpPacketInfo(); rhs = RtpPacketInfo();
EXPECT_NE(rhs.ssrc(), value); EXPECT_NE(rhs.ssrc(), value);
rhs = RtpPacketInfo(value, {}, {}, {}, {}, Timestamp::Millis(0)); rhs = RtpPacketInfo(value, {}, {}, {}, {}, Timestamp::Zero());
EXPECT_EQ(rhs.ssrc(), value); EXPECT_EQ(rhs.ssrc(), value);
} }
@ -64,7 +64,7 @@ TEST(RtpPacketInfoTest, Csrcs) {
rhs = RtpPacketInfo(); rhs = RtpPacketInfo();
EXPECT_NE(rhs.csrcs(), value); EXPECT_NE(rhs.csrcs(), value);
rhs = RtpPacketInfo({}, value, {}, {}, {}, Timestamp::Millis(0)); rhs = RtpPacketInfo({}, value, {}, {}, {}, Timestamp::Zero());
EXPECT_EQ(rhs.csrcs(), value); EXPECT_EQ(rhs.csrcs(), value);
} }
@ -91,7 +91,7 @@ TEST(RtpPacketInfoTest, RtpTimestamp) {
rhs = RtpPacketInfo(); rhs = RtpPacketInfo();
EXPECT_NE(rhs.rtp_timestamp(), value); EXPECT_NE(rhs.rtp_timestamp(), value);
rhs = RtpPacketInfo({}, {}, value, {}, {}, Timestamp::Millis(0)); rhs = RtpPacketInfo({}, {}, value, {}, {}, Timestamp::Zero());
EXPECT_EQ(rhs.rtp_timestamp(), value); EXPECT_EQ(rhs.rtp_timestamp(), value);
} }
@ -118,7 +118,7 @@ TEST(RtpPacketInfoTest, AudioLevel) {
rhs = RtpPacketInfo(); rhs = RtpPacketInfo();
EXPECT_NE(rhs.audio_level(), value); EXPECT_NE(rhs.audio_level(), value);
rhs = RtpPacketInfo({}, {}, {}, value, {}, Timestamp::Millis(0)); rhs = RtpPacketInfo({}, {}, {}, value, {}, Timestamp::Zero());
EXPECT_EQ(rhs.audio_level(), value); EXPECT_EQ(rhs.audio_level(), value);
} }
@ -145,7 +145,7 @@ TEST(RtpPacketInfoTest, AbsoluteCaptureTime) {
rhs = RtpPacketInfo(); rhs = RtpPacketInfo();
EXPECT_NE(rhs.absolute_capture_time(), value); EXPECT_NE(rhs.absolute_capture_time(), value);
rhs = RtpPacketInfo({}, {}, {}, {}, value, Timestamp::Millis(0)); rhs = RtpPacketInfo({}, {}, {}, {}, value, Timestamp::Zero());
EXPECT_EQ(rhs.absolute_capture_time(), value); EXPECT_EQ(rhs.absolute_capture_time(), value);
} }
@ -174,7 +174,7 @@ TEST(RtpPacketInfoTest, LocalCaptureClockOffset) {
// Default local capture clock offset is null. // Default local capture clock offset is null.
rhs = RtpPacketInfo({}, {}, {}, {}, AbsoluteCaptureTime{12, 34}, rhs = RtpPacketInfo({}, {}, {}, {}, AbsoluteCaptureTime{12, 34},
Timestamp::Millis(0)); Timestamp::Zero());
EXPECT_EQ(rhs.local_capture_clock_offset(), absl::nullopt); EXPECT_EQ(rhs.local_capture_clock_offset(), absl::nullopt);
} }

2
call/rtp_video_sender_unittest.cc
View file

@ -208,7 +208,7 @@ class RtpVideoSenderTestFixture {
// SendTask(). // SendTask().
void RunOnTransportQueue(absl::AnyInvocable<void() &&> task) { void RunOnTransportQueue(absl::AnyInvocable<void() &&> task) {
transport_controller_.GetWorkerQueue()->PostTask(std::move(task)); transport_controller_.GetWorkerQueue()->PostTask(std::move(task));
AdvanceTime(TimeDelta::Millis(0)); AdvanceTime(TimeDelta::Zero());
} }
private: private:

4
call/simulated_network_unittest.cc
View file

@ -40,7 +40,7 @@ TEST(SimulatedNetworkTest, CodelDoesNothingAtCapacity) {
packet_size / link_capacity + TimeDelta::Millis(1); packet_size / link_capacity + TimeDelta::Millis(1);
// Send at capacity and see we get no loss. // Send at capacity and see we get no loss.
Timestamp start_time = Timestamp::Millis(0); Timestamp start_time = Timestamp::Zero();
Timestamp current_time = start_time; Timestamp current_time = start_time;
Timestamp next_packet_time = start_time; Timestamp next_packet_time = start_time;
uint64_t next_id = 0; uint64_t next_id = 0;
@ -94,7 +94,7 @@ TEST(SimulatedNetworkTest, CodelLimitsDelayAndDropsPacketsOnOverload) {
const DataSize packet_size = overload_rate * link_capacity * packet_inverval; const DataSize packet_size = overload_rate * link_capacity * packet_inverval;
// Send above capacity and see delays are still controlled at the cost of // Send above capacity and see delays are still controlled at the cost of
// packet loss. // packet loss.
Timestamp start_time = Timestamp::Millis(0); Timestamp start_time = Timestamp::Zero();
Timestamp current_time = start_time; Timestamp current_time = start_time;
Timestamp next_packet_time = start_time; Timestamp next_packet_time = start_time;
Timestamp last_check = start_time; Timestamp last_check = start_time;

6
call/video_receive_stream.h
View file

@ -105,11 +105,11 @@ class VideoReceiveStreamInterface : public MediaReceiveStreamInterface {
uint32_t frames_dropped = 0; uint32_t frames_dropped = 0;
uint32_t frames_decoded = 0; uint32_t frames_decoded = 0;
// https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totaldecodetime // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totaldecodetime
webrtc::TimeDelta total_decode_time = webrtc::TimeDelta::Millis(0); TimeDelta total_decode_time = TimeDelta::Zero();
// https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totalprocessingdelay // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totalprocessingdelay
webrtc::TimeDelta total_processing_delay = webrtc::TimeDelta::Millis(0); TimeDelta total_processing_delay = TimeDelta::Zero();
// TODO(bugs.webrtc.org/13986): standardize // TODO(bugs.webrtc.org/13986): standardize
webrtc::TimeDelta total_assembly_time = webrtc::TimeDelta::Millis(0); TimeDelta total_assembly_time = TimeDelta::Zero();
uint32_t frames_assembled_from_multiple_packets = 0; uint32_t frames_assembled_from_multiple_packets = 0;
// Total inter frame delay in seconds. // Total inter frame delay in seconds.
// https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totalinterframedelay // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totalinterframedelay

6
media/base/media_channel.h
View file

@ -630,10 +630,10 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
uint32_t frames_rendered = 0; uint32_t frames_rendered = 0;
absl::optional<uint64_t> qp_sum; absl::optional<uint64_t> qp_sum;
// https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totaldecodetime // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totaldecodetime
webrtc::TimeDelta total_decode_time = webrtc::TimeDelta::Millis(0); webrtc::TimeDelta total_decode_time = webrtc::TimeDelta::Zero();
// https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totalprocessingdelay // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-totalprocessingdelay
webrtc::TimeDelta total_processing_delay = webrtc::TimeDelta::Millis(0); webrtc::TimeDelta total_processing_delay = webrtc::TimeDelta::Zero();
webrtc::TimeDelta total_assembly_time = webrtc::TimeDelta::Millis(0); webrtc::TimeDelta total_assembly_time = webrtc::TimeDelta::Zero();
uint32_t frames_assembled_from_multiple_packets = 0; uint32_t frames_assembled_from_multiple_packets = 0;
double total_inter_frame_delay = 0; double total_inter_frame_delay = 0;
double total_squared_inter_frame_delay = 0; double total_squared_inter_frame_delay = 0;

2
modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
View file

@ -236,7 +236,7 @@ class NetworkControllerTestFixture {
int min_data_rate_kbps = 0, int min_data_rate_kbps = 0,
int max_data_rate_kbps = 5 * kInitialBitrateKbps) { int max_data_rate_kbps = 5 * kInitialBitrateKbps) {
NetworkControllerConfig config; NetworkControllerConfig config;
config.constraints.at_time = Timestamp::Millis(0); config.constraints.at_time = Timestamp::Zero();
config.constraints.min_data_rate = config.constraints.min_data_rate =
DataRate::KilobitsPerSec(min_data_rate_kbps); DataRate::KilobitsPerSec(min_data_rate_kbps);
config.constraints.max_data_rate = config.constraints.max_data_rate =

4
modules/congestion_controller/goog_cc/robust_throughput_estimator.cc
View file

@ -90,8 +90,8 @@ absl::optional<DataRate> RobustThroughputEstimator::bitrate() const {
if (window_.empty() || window_.size() < settings_.required_packets) if (window_.empty() || window_.size() < settings_.required_packets)
return absl::nullopt; return absl::nullopt;
TimeDelta largest_recv_gap(TimeDelta::Millis(0)); TimeDelta largest_recv_gap(TimeDelta::Zero());
TimeDelta second_largest_recv_gap(TimeDelta::Millis(0)); TimeDelta second_largest_recv_gap(TimeDelta::Zero());
for (size_t i = 1; i < window_.size(); i++) { for (size_t i = 1; i < window_.size(); i++) {
// Find receive time gaps. // Find receive time gaps.
TimeDelta gap = window_[i].receive_time - window_[i - 1].receive_time; TimeDelta gap = window_[i].receive_time - window_[i - 1].receive_time;

18
modules/pacing/bitrate_prober_unittest.cc
View file

@ -23,7 +23,7 @@ TEST(BitrateProberTest, VerifyStatesAndTimeBetweenProbes) {
BitrateProber prober(config); BitrateProber prober(config);
EXPECT_FALSE(prober.is_probing()); EXPECT_FALSE(prober.is_probing());
Timestamp now = Timestamp::Millis(0); Timestamp now = Timestamp::Zero();
const Timestamp start_time = now; const Timestamp start_time = now;
EXPECT_EQ(prober.NextProbeTime(now), Timestamp::PlusInfinity()); EXPECT_EQ(prober.NextProbeTime(now), Timestamp::PlusInfinity());
@ -160,7 +160,7 @@ TEST(BitrateProberTest, VerifyProbeSizeOnHighBitrate) {
const DataRate kHighBitrate = DataRate::KilobitsPerSec(10000); // 10 Mbps const DataRate kHighBitrate = DataRate::KilobitsPerSec(10000); // 10 Mbps
prober.CreateProbeCluster({.at_time = Timestamp::Millis(0), prober.CreateProbeCluster({.at_time = Timestamp::Zero(),
.target_data_rate = kHighBitrate, .target_data_rate = kHighBitrate,
.target_duration = TimeDelta::Millis(15), .target_duration = TimeDelta::Millis(15),
.target_probe_count = 5, .target_probe_count = 5,
@ -178,8 +178,8 @@ TEST(BitrateProberTest, MinumumNumberOfProbingPackets) {
const DataRate kBitrate = DataRate::KilobitsPerSec(100); const DataRate kBitrate = DataRate::KilobitsPerSec(100);
const DataSize kPacketSize = DataSize::Bytes(1000); const DataSize kPacketSize = DataSize::Bytes(1000);
Timestamp now = Timestamp::Millis(0); Timestamp now = Timestamp::Zero();
prober.CreateProbeCluster({.at_time = Timestamp::Millis(0), prober.CreateProbeCluster({.at_time = Timestamp::Zero(),
.target_data_rate = kBitrate, .target_data_rate = kBitrate,
.target_duration = TimeDelta::Millis(15), .target_duration = TimeDelta::Millis(15),
.target_probe_count = 5, .target_probe_count = 5,
@ -201,8 +201,8 @@ TEST(BitrateProberTest, ScaleBytesUsedForProbing) {
const DataSize kPacketSize = DataSize::Bytes(1000); const DataSize kPacketSize = DataSize::Bytes(1000);
const DataSize kExpectedDataSent = kBitrate * TimeDelta::Millis(15); const DataSize kExpectedDataSent = kBitrate * TimeDelta::Millis(15);
Timestamp now = Timestamp::Millis(0); Timestamp now = Timestamp::Zero();
prober.CreateProbeCluster({.at_time = Timestamp::Millis(0), prober.CreateProbeCluster({.at_time = Timestamp::Zero(),
.target_data_rate = kBitrate, .target_data_rate = kBitrate,
.target_duration = TimeDelta::Millis(15), .target_duration = TimeDelta::Millis(15),
.target_probe_count = 5, .target_probe_count = 5,
@ -225,8 +225,8 @@ TEST(BitrateProberTest, HighBitrateProbing) {
const DataSize kPacketSize = DataSize::Bytes(1000); const DataSize kPacketSize = DataSize::Bytes(1000);
const DataSize kExpectedDataSent = kBitrate * TimeDelta::Millis(15); const DataSize kExpectedDataSent = kBitrate * TimeDelta::Millis(15);
Timestamp now = Timestamp::Millis(0); Timestamp now = Timestamp::Zero();
prober.CreateProbeCluster({.at_time = Timestamp::Millis(0), prober.CreateProbeCluster({.at_time = Timestamp::Zero(),
.target_data_rate = kBitrate, .target_data_rate = kBitrate,
.target_duration = TimeDelta::Millis(15), .target_duration = TimeDelta::Millis(15),
.target_probe_count = 5, .target_probe_count = 5,
@ -251,7 +251,7 @@ TEST(BitrateProberTest, ProbeClusterTimeout) {
const DataSize kExpectedDataSent = kSmallPacketSize * 2 * 5; const DataSize kExpectedDataSent = kSmallPacketSize * 2 * 5;
const TimeDelta kTimeout = TimeDelta::Millis(5000); const TimeDelta kTimeout = TimeDelta::Millis(5000);
Timestamp now = Timestamp::Millis(0); Timestamp now = Timestamp::Zero();
prober.CreateProbeCluster({.at_time = now, prober.CreateProbeCluster({.at_time = now,
.target_data_rate = kBitrate, .target_data_rate = kBitrate,
.target_duration = TimeDelta::Millis(15), .target_duration = TimeDelta::Millis(15),

4
modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
View file

@ -562,7 +562,7 @@ TEST_F(RemoteEstimatorProxyOnRequestTest,
} }
TEST_F(RemoteEstimatorProxyTest, ReportsIncomingPacketToNetworkStateEstimator) { TEST_F(RemoteEstimatorProxyTest, ReportsIncomingPacketToNetworkStateEstimator) {
Timestamp first_send_timestamp = Timestamp::Millis(0); Timestamp first_send_timestamp = Timestamp::Zero();
const DataSize kPacketOverhead = DataSize::Bytes(38); const DataSize kPacketOverhead = DataSize::Bytes(38);
proxy_.SetTransportOverhead(kPacketOverhead); proxy_.SetTransportOverhead(kPacketOverhead);
@ -605,7 +605,7 @@ TEST_F(RemoteEstimatorProxyTest, IncomingPacketHandlesWrapInAbsSendTime) {
AbsoluteSendTime::To24Bits(Timestamp::Millis(1 << 24)); AbsoluteSendTime::To24Bits(Timestamp::Millis(1 << 24));
const TimeDelta kExpectedAbsSendTimeDelta = TimeDelta::Millis(30); const TimeDelta kExpectedAbsSendTimeDelta = TimeDelta::Millis(30);
Timestamp first_send_timestamp = Timestamp::Millis(0); Timestamp first_send_timestamp = Timestamp::Zero();
EXPECT_CALL(network_state_estimator_, OnReceivedPacket(_)) EXPECT_CALL(network_state_estimator_, OnReceivedPacket(_))
.WillOnce(Invoke([&first_send_timestamp](const PacketResult& packet) { .WillOnce(Invoke([&first_send_timestamp](const PacketResult& packet) {
EXPECT_EQ(packet.receive_time, kBaseTime); EXPECT_EQ(packet.receive_time, kBaseTime);

8
modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc
View file

@ -497,8 +497,8 @@ TEST_P(RtpRtcpImpl2Test, RttForReceiverOnly) {
TEST_P(RtpRtcpImpl2Test, NoSrBeforeMedia) { TEST_P(RtpRtcpImpl2Test, NoSrBeforeMedia) {
// Ignore fake transport delays in this test. // Ignore fake transport delays in this test.
sender_.transport_.SimulateNetworkDelay(TimeDelta::Millis(0)); sender_.transport_.SimulateNetworkDelay(TimeDelta::Zero());
receiver_.transport_.SimulateNetworkDelay(TimeDelta::Millis(0)); receiver_.transport_.SimulateNetworkDelay(TimeDelta::Zero());
// Move ahead to the instant a rtcp is expected. // Move ahead to the instant a rtcp is expected.
// Verify no SR is sent before media has been sent, RR should still be sent // Verify no SR is sent before media has been sent, RR should still be sent
@ -607,7 +607,7 @@ TEST_P(RtpRtcpImpl2Test, SendsExtendedNackList) {
} }
TEST_P(RtpRtcpImpl2Test, ReSendsNackListAfterRttMs) { TEST_P(RtpRtcpImpl2Test, ReSendsNackListAfterRttMs) {
sender_.transport_.SimulateNetworkDelay(TimeDelta::Millis(0)); sender_.transport_.SimulateNetworkDelay(TimeDelta::Zero());
// Send module sends a NACK. // Send module sends a NACK.
const uint16_t kNackLength = 2; const uint16_t kNackLength = 2;
uint16_t nack_list[kNackLength] = {123, 125}; uint16_t nack_list[kNackLength] = {123, 125};
@ -632,7 +632,7 @@ TEST_P(RtpRtcpImpl2Test, ReSendsNackListAfterRttMs) {
} }
TEST_P(RtpRtcpImpl2Test, UniqueNackRequests) { TEST_P(RtpRtcpImpl2Test, UniqueNackRequests) {
receiver_.transport_.SimulateNetworkDelay(TimeDelta::Millis(0)); receiver_.transport_.SimulateNetworkDelay(TimeDelta::Zero());
EXPECT_EQ(0U, receiver_.RtcpSent().nack_packets); EXPECT_EQ(0U, receiver_.RtcpSent().nack_packets);
EXPECT_EQ(0U, receiver_.RtcpSent().nack_requests); EXPECT_EQ(0U, receiver_.RtcpSent().nack_requests);
EXPECT_EQ(0U, receiver_.RtcpSent().unique_nack_requests); EXPECT_EQ(0U, receiver_.RtcpSent().unique_nack_requests);

4
modules/video_coding/frame_buffer2_unittest.cc
View file

@ -194,7 +194,7 @@ class TestFrameBuffer2 : public ::testing::Test {
}); });
}); });
if (max_wait_time == 0) { if (max_wait_time == 0) {
time_controller_.AdvanceTime(TimeDelta::Millis(0)); time_controller_.AdvanceTime(TimeDelta::Zero());
} }
} }
@ -304,7 +304,7 @@ TEST_F(TestFrameBuffer2, DISABLED_OneUnorderedSuperFrame) {
ExtractFrame(50); ExtractFrame(50);
InsertFrame(pid, 1, ts, true, kFrameSize); InsertFrame(pid, 1, ts, true, kFrameSize);
InsertFrame(pid, 0, ts, false, kFrameSize); InsertFrame(pid, 0, ts, false, kFrameSize);
time_controller_.AdvanceTime(TimeDelta::Millis(0)); time_controller_.AdvanceTime(TimeDelta::Zero());
CheckFrame(0, pid, 0); CheckFrame(0, pid, 0);
CheckFrame(1, pid, 1); CheckFrame(1, pid, 1);

4
modules/video_coding/timing/timing_unittest.cc
View file

@ -150,10 +150,10 @@ TEST(ReceiverTimingTest, UseLowLatencyRenderer) {
timing.set_max_playout_delay(TimeDelta::Millis(20)); timing.set_max_playout_delay(TimeDelta::Millis(20));
EXPECT_FALSE(timing.RenderParameters().use_low_latency_rendering); EXPECT_FALSE(timing.RenderParameters().use_low_latency_rendering);
// True if min==0, max > 0. // True if min==0, max > 0.
timing.set_min_playout_delay(TimeDelta::Millis(0)); timing.set_min_playout_delay(TimeDelta::Zero());
EXPECT_TRUE(timing.RenderParameters().use_low_latency_rendering); EXPECT_TRUE(timing.RenderParameters().use_low_latency_rendering);
// True if min==max==0. // True if min==max==0.
timing.set_max_playout_delay(TimeDelta::Millis(0)); timing.set_max_playout_delay(TimeDelta::Zero());
EXPECT_TRUE(timing.RenderParameters().use_low_latency_rendering); EXPECT_TRUE(timing.RenderParameters().use_low_latency_rendering);
// True also for max playout delay==500 ms. // True also for max playout delay==500 ms.
timing.set_max_playout_delay(TimeDelta::Millis(500)); timing.set_max_playout_delay(TimeDelta::Millis(500));

2
p2p/base/stun_request.cc
View file

@ -74,7 +74,7 @@ void StunRequestManager::FlushForTest(int msg_type) {
// of canceling any outstanding tasks and prepare a new flag for // of canceling any outstanding tasks and prepare a new flag for
// operations related to this call to `Send`. // operations related to this call to `Send`.
request->ResetTasksForTest(); request->ResetTasksForTest();
request->Send(webrtc::TimeDelta::Millis(0)); request->Send(webrtc::TimeDelta::Zero());
} }
} }
} }

9
pc/rtc_stats_collector.cc
View file

@ -564,14 +564,11 @@ void SetInboundRTPStreamStatsFromVideoReceiverInfo(
if (video_receiver_info.qp_sum) if (video_receiver_info.qp_sum)
inbound_video->qp_sum = *video_receiver_info.qp_sum; inbound_video->qp_sum = *video_receiver_info.qp_sum;
inbound_video->total_decode_time = inbound_video->total_decode_time =
static_cast<double>(video_receiver_info.total_decode_time.ms()) / video_receiver_info.total_decode_time.seconds<double>();
rtc::kNumMillisecsPerSec;
inbound_video->total_processing_delay = inbound_video->total_processing_delay =
static_cast<double>(video_receiver_info.total_processing_delay.ms()) / video_receiver_info.total_processing_delay.seconds<double>();
rtc::kNumMillisecsPerSec;
inbound_video->total_assembly_time = inbound_video->total_assembly_time =
static_cast<double>(video_receiver_info.total_assembly_time.ms()) / video_receiver_info.total_assembly_time.seconds<double>();
rtc::kNumMillisecsPerSec;
inbound_video->frames_assembled_from_multiple_packets = inbound_video->frames_assembled_from_multiple_packets =
video_receiver_info.frames_assembled_from_multiple_packets; video_receiver_info.frames_assembled_from_multiple_packets;
inbound_video->total_inter_frame_delay = inbound_video->total_inter_frame_delay =

2
pc/video_rtp_track_source_unittest.cc
View file

@ -121,7 +121,7 @@ class TestFrame : public RecordableEncodedFrame {
EncodedResolution resolution() const override { EncodedResolution resolution() const override {
return EncodedResolution{0, 0}; return EncodedResolution{0, 0};
} }
Timestamp render_time() const override { return Timestamp::Millis(0); } Timestamp render_time() const override { return Timestamp::Zero(); }
}; };
TEST(VideoRtpTrackSourceTest, BroadcastsFrames) { TEST(VideoRtpTrackSourceTest, BroadcastsFrames) {

4
rtc_base/task_utils/repeating_task_unittest.cc
View file

@ -195,7 +195,7 @@ TEST(RepeatingTaskTest, CompensatesForLongRunTime) {
} }
TEST(RepeatingTaskTest, CompensatesForShortRunTime) { TEST(RepeatingTaskTest, CompensatesForShortRunTime) {
SimulatedClock clock(Timestamp::Millis(0)); SimulatedClock clock(Timestamp::Zero());
FakeTaskQueue task_queue(&clock); FakeTaskQueue task_queue(&clock);
std::atomic_int counter(0); std::atomic_int counter(0);
RepeatingTaskHandle::Start( RepeatingTaskHandle::Start(
@ -336,7 +336,7 @@ TEST(RepeatingTaskTest, Example) {
TEST(RepeatingTaskTest, ClockIntegration) { TEST(RepeatingTaskTest, ClockIntegration) {
absl::AnyInvocable<void() &&> delayed_task; absl::AnyInvocable<void() &&> delayed_task;
TimeDelta expected_delay = TimeDelta::Zero(); TimeDelta expected_delay = TimeDelta::Zero();
SimulatedClock clock(Timestamp::Millis(0)); SimulatedClock clock(Timestamp::Zero());
NiceMock<MockTaskQueue> task_queue; NiceMock<MockTaskQueue> task_queue;
ON_CALL(task_queue, PostDelayedTask) ON_CALL(task_queue, PostDelayedTask)

6
video/adaptation/pixel_limit_resource_unittest.cc
View file

@ -48,7 +48,7 @@ class PixelLimitResourceTest : public ::testing::Test {
void RunTaskOnTaskQueue(absl::AnyInvocable<void() &&> task) { void RunTaskOnTaskQueue(absl::AnyInvocable<void() &&> task) {
task_queue_->PostTask(std::move(task)); task_queue_->PostTask(std::move(task));
time_controller_.AdvanceTime(TimeDelta::Millis(0)); time_controller_.AdvanceTime(TimeDelta::Zero());
} }
protected: protected:
@ -83,7 +83,7 @@ TEST_F(PixelLimitResourceTest,
rtc::scoped_refptr<PixelLimitResource> pixel_limit_resource = rtc::scoped_refptr<PixelLimitResource> pixel_limit_resource =
PixelLimitResource::Create(task_queue_.get(), &input_state_provider_); PixelLimitResource::Create(task_queue_.get(), &input_state_provider_);
pixel_limit_resource->SetResourceListener(&resource_listener); pixel_limit_resource->SetResourceListener(&resource_listener);
time_controller_.AdvanceTime(TimeDelta::Millis(0)); time_controller_.AdvanceTime(TimeDelta::Zero());
pixel_limit_resource->SetMaxPixels(kMaxPixels); pixel_limit_resource->SetMaxPixels(kMaxPixels);
SetCurrentPixels(kMaxPixels + 1); SetCurrentPixels(kMaxPixels + 1);
@ -118,7 +118,7 @@ TEST_F(PixelLimitResourceTest,
rtc::scoped_refptr<PixelLimitResource> pixel_limit_resource = rtc::scoped_refptr<PixelLimitResource> pixel_limit_resource =
PixelLimitResource::Create(task_queue_.get(), &input_state_provider_); PixelLimitResource::Create(task_queue_.get(), &input_state_provider_);
pixel_limit_resource->SetResourceListener(&resource_listener); pixel_limit_resource->SetResourceListener(&resource_listener);
time_controller_.AdvanceTime(TimeDelta::Millis(0)); time_controller_.AdvanceTime(TimeDelta::Zero());
pixel_limit_resource->SetMaxPixels(kMaxPixels); pixel_limit_resource->SetMaxPixels(kMaxPixels);
SetCurrentPixels(kMinPixels - 1); SetCurrentPixels(kMinPixels - 1);

2
video/encoder_rtcp_feedback.cc
View file

@ -35,7 +35,7 @@ EncoderRtcpFeedback::EncoderRtcpFeedback(
ssrcs_(ssrcs), ssrcs_(ssrcs),
get_packet_infos_(std::move(get_packet_infos)), get_packet_infos_(std::move(get_packet_infos)),
video_stream_encoder_(encoder), video_stream_encoder_(encoder),
time_last_packet_delivery_queue_(Timestamp::Millis(0)), time_last_packet_delivery_queue_(Timestamp::Zero()),
min_keyframe_send_interval_( min_keyframe_send_interval_(
TimeDelta::Millis(KeyframeIntervalSettings::ParseFromFieldTrials() TimeDelta::Millis(KeyframeIntervalSettings::ParseFromFieldTrials()
.MinKeyframeSendIntervalMs() .MinKeyframeSendIntervalMs()

26
video/frame_cadence_adapter_unittest.cc
View file

@ -126,7 +126,7 @@ TEST(FrameCadenceAdapterTest, CountsOutstandingFramesToProcess) {
TEST(FrameCadenceAdapterTest, FrameRateFollowsRateStatisticsByDefault) { TEST(FrameCadenceAdapterTest, FrameRateFollowsRateStatisticsByDefault) {
test::ScopedKeyValueConfig no_field_trials; test::ScopedKeyValueConfig no_field_trials;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(no_field_trials, time_controller.GetClock()); auto adapter = CreateAdapter(no_field_trials, time_controller.GetClock());
adapter->Initialize(nullptr); adapter->Initialize(nullptr);
@ -148,7 +148,7 @@ TEST(FrameCadenceAdapterTest, FrameRateFollowsRateStatisticsByDefault) {
TEST(FrameCadenceAdapterTest, TEST(FrameCadenceAdapterTest,
FrameRateFollowsRateStatisticsWhenFeatureDisabled) { FrameRateFollowsRateStatisticsWhenFeatureDisabled) {
ZeroHertzFieldTrialDisabler feature_disabler; ZeroHertzFieldTrialDisabler feature_disabler;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(feature_disabler, time_controller.GetClock()); auto adapter = CreateAdapter(feature_disabler, time_controller.GetClock());
adapter->Initialize(nullptr); adapter->Initialize(nullptr);
@ -169,7 +169,7 @@ TEST(FrameCadenceAdapterTest,
TEST(FrameCadenceAdapterTest, FrameRateFollowsMaxFpsWhenZeroHertzActivated) { TEST(FrameCadenceAdapterTest, FrameRateFollowsMaxFpsWhenZeroHertzActivated) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(nullptr); adapter->Initialize(nullptr);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -185,7 +185,7 @@ TEST(FrameCadenceAdapterTest, FrameRateFollowsMaxFpsWhenZeroHertzActivated) {
TEST(FrameCadenceAdapterTest, TEST(FrameCadenceAdapterTest,
FrameRateFollowsRateStatisticsAfterZeroHertzDeactivated) { FrameRateFollowsRateStatisticsAfterZeroHertzDeactivated) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(nullptr); adapter->Initialize(nullptr);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -214,7 +214,7 @@ TEST(FrameCadenceAdapterTest,
TEST(FrameCadenceAdapterTest, ForwardsFramesDelayed) { TEST(FrameCadenceAdapterTest, ForwardsFramesDelayed) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -336,7 +336,7 @@ TEST(FrameCadenceAdapterTest, StopsRepeatingFramesDelayed) {
// At 3.5s, we receive this frame. // At 3.5s, we receive this frame.
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -364,7 +364,7 @@ TEST(FrameCadenceAdapterTest, StopsRepeatingFramesDelayed) {
TEST(FrameCadenceAdapterTest, RequestsRefreshFrameOnKeyFrameRequestWhenNew) { TEST(FrameCadenceAdapterTest, RequestsRefreshFrameOnKeyFrameRequestWhenNew) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -382,7 +382,7 @@ TEST(FrameCadenceAdapterTest, RequestsRefreshFrameOnKeyFrameRequestWhenNew) {
TEST(FrameCadenceAdapterTest, IgnoresKeyFrameRequestShortlyAfterFrame) { TEST(FrameCadenceAdapterTest, IgnoresKeyFrameRequestShortlyAfterFrame) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -397,7 +397,7 @@ TEST(FrameCadenceAdapterTest, IgnoresKeyFrameRequestShortlyAfterFrame) {
TEST(FrameCadenceAdapterTest, RequestsRefreshFramesUntilArrival) { TEST(FrameCadenceAdapterTest, RequestsRefreshFramesUntilArrival) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -423,7 +423,7 @@ TEST(FrameCadenceAdapterTest, RequestsRefreshFramesUntilArrival) {
TEST(FrameCadenceAdapterTest, RequestsRefreshAfterFrameDrop) { TEST(FrameCadenceAdapterTest, RequestsRefreshAfterFrameDrop) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -464,7 +464,7 @@ TEST(FrameCadenceAdapterTest, RequestsRefreshAfterFrameDrop) {
TEST(FrameCadenceAdapterTest, OmitsRefreshAfterFrameDropWithTimelyFrameEntry) { TEST(FrameCadenceAdapterTest, OmitsRefreshAfterFrameDropWithTimelyFrameEntry) {
ZeroHertzFieldTrialEnabler enabler; ZeroHertzFieldTrialEnabler enabler;
MockCallback callback; MockCallback callback;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto adapter = CreateAdapter(enabler, time_controller.GetClock()); auto adapter = CreateAdapter(enabler, time_controller.GetClock());
adapter->Initialize(&callback); adapter->Initialize(&callback);
adapter->SetZeroHertzModeEnabled( adapter->SetZeroHertzModeEnabled(
@ -524,7 +524,7 @@ class FrameCadenceAdapterSimulcastLayersParamTest
protected: protected:
ZeroHertzFieldTrialEnabler enabler_; ZeroHertzFieldTrialEnabler enabler_;
MockCallback callback_; MockCallback callback_;
GlobalSimulatedTimeController time_controller_{Timestamp::Millis(0)}; GlobalSimulatedTimeController time_controller_{Timestamp::Zero()};
const std::unique_ptr<FrameCadenceAdapterInterface> adapter_{ const std::unique_ptr<FrameCadenceAdapterInterface> adapter_{
CreateAdapter(enabler_, time_controller_.GetClock())}; CreateAdapter(enabler_, time_controller_.GetClock())};
}; };
@ -651,7 +651,7 @@ class ZeroHertzLayerQualityConvergenceTest : public ::testing::Test {
protected: protected:
ZeroHertzFieldTrialEnabler field_trial_enabler_; ZeroHertzFieldTrialEnabler field_trial_enabler_;
MockCallback callback_; MockCallback callback_;
GlobalSimulatedTimeController time_controller_{Timestamp::Millis(0)}; GlobalSimulatedTimeController time_controller_{Timestamp::Zero()};
std::unique_ptr<FrameCadenceAdapterInterface> adapter_{ std::unique_ptr<FrameCadenceAdapterInterface> adapter_{
CreateAdapter(field_trial_enabler_, time_controller_.GetClock())}; CreateAdapter(field_trial_enabler_, time_controller_.GetClock())};
}; };

8
video/receive_statistics_proxy2.cc
View file

@ -769,10 +769,10 @@ void ReceiveStatisticsProxy::OnDecodedFrame(const VideoFrame& frame,
absl::optional<uint8_t> qp, absl::optional<uint8_t> qp,
TimeDelta decode_time, TimeDelta decode_time,
VideoContentType content_type) { VideoContentType content_type) {
webrtc::TimeDelta processing_delay = webrtc::TimeDelta::Millis(0); TimeDelta processing_delay = TimeDelta::Zero();
webrtc::Timestamp current_time = clock_->CurrentTime(); webrtc::Timestamp current_time = clock_->CurrentTime();
// TODO(bugs.webrtc.org/13984): some tests do not fill packet_infos(). // TODO(bugs.webrtc.org/13984): some tests do not fill packet_infos().
webrtc::TimeDelta assembly_time = webrtc::TimeDelta::Millis(0); TimeDelta assembly_time = TimeDelta::Zero();
if (frame.packet_infos().size() > 0) { if (frame.packet_infos().size() > 0) {
const auto [first_packet, last_packet] = std::minmax_element( const auto [first_packet, last_packet] = std::minmax_element(
frame.packet_infos().cbegin(), frame.packet_infos().cend(), frame.packet_infos().cbegin(), frame.packet_infos().cend(),
@ -803,8 +803,8 @@ void ReceiveStatisticsProxy::OnDecodedFrame(
const VideoFrameMetaData& frame_meta, const VideoFrameMetaData& frame_meta,
absl::optional<uint8_t> qp, absl::optional<uint8_t> qp,
TimeDelta decode_time, TimeDelta decode_time,
webrtc::TimeDelta processing_delay, TimeDelta processing_delay,
webrtc::TimeDelta assembly_time, TimeDelta assembly_time,
VideoContentType content_type) { VideoContentType content_type) {
RTC_DCHECK_RUN_ON(&main_thread_); RTC_DCHECK_RUN_ON(&main_thread_);

8
video/receive_statistics_proxy2.h
View file

@ -57,7 +57,7 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
void OnDecodedFrame(const VideoFrame& frame, void OnDecodedFrame(const VideoFrame& frame,
absl::optional<uint8_t> qp, absl::optional<uint8_t> qp,
webrtc::TimeDelta decode_time, TimeDelta decode_time,
VideoContentType content_type); VideoContentType content_type);
// Called asyncronously on the worker thread as a result of a call to the // Called asyncronously on the worker thread as a result of a call to the
@ -65,9 +65,9 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
// the actual decoding happens. // the actual decoding happens.
void OnDecodedFrame(const VideoFrameMetaData& frame_meta, void OnDecodedFrame(const VideoFrameMetaData& frame_meta,
absl::optional<uint8_t> qp, absl::optional<uint8_t> qp,
webrtc::TimeDelta decode_time, TimeDelta decode_time,
webrtc::TimeDelta processing_delay, TimeDelta processing_delay,
webrtc::TimeDelta assembly_time, TimeDelta assembly_time,
VideoContentType content_type); VideoContentType content_type);
void OnSyncOffsetUpdated(int64_t video_playout_ntp_ms, void OnSyncOffsetUpdated(int64_t video_playout_ntp_ms,

172
video/receive_statistics_proxy2_unittest.cc
View file

@ -111,8 +111,7 @@ TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameIncreasesFramesDecoded) {
EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded); EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded);
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (uint32_t i = 1; i <= 3; ++i) { for (uint32_t i = 1; i <= 3; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(i, FlushAndGetStats().frames_decoded); EXPECT_EQ(i, FlushAndGetStats().frames_decoded);
} }
@ -123,8 +122,7 @@ TEST_F(ReceiveStatisticsProxy2Test, DecodedFpsIsReported) {
const int kRequiredSamples = metrics::kMinRunTimeInSeconds * kFps; const int kRequiredSamples = metrics::kMinRunTimeInSeconds * kFps;
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (int i = 0; i < kRequiredSamples; ++i) { for (int i = 0; i < kRequiredSamples; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
fake_clock_.AdvanceTimeMilliseconds(1000 / kFps); fake_clock_.AdvanceTimeMilliseconds(1000 / kFps);
} }
@ -140,8 +138,7 @@ TEST_F(ReceiveStatisticsProxy2Test, DecodedFpsIsNotReportedForTooFewSamples) {
const int kRequiredSamples = metrics::kMinRunTimeInSeconds * kFps; const int kRequiredSamples = metrics::kMinRunTimeInSeconds * kFps;
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (int i = 0; i < kRequiredSamples - 1; ++i) { for (int i = 0; i < kRequiredSamples - 1; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
fake_clock_.AdvanceTimeMilliseconds(1000 / kFps); fake_clock_.AdvanceTimeMilliseconds(1000 / kFps);
} }
@ -154,7 +151,7 @@ TEST_F(ReceiveStatisticsProxy2Test,
OnDecodedFrameWithQpDoesNotResetFramesDecodedOrTotalDecodeTime) { OnDecodedFrameWithQpDoesNotResetFramesDecodedOrTotalDecodeTime) {
EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded); EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded);
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
TimeDelta expected_total_decode_time = TimeDelta::Millis(0); TimeDelta expected_total_decode_time = TimeDelta::Zero();
unsigned int expected_frames_decoded = 0; unsigned int expected_frames_decoded = 0;
for (uint32_t i = 1; i <= 3; ++i) { for (uint32_t i = 1; i <= 3; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt,
@ -183,7 +180,7 @@ TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameIncreasesProcessingDelay) {
const TimeDelta kProcessingDelay = TimeDelta::Millis(10); const TimeDelta kProcessingDelay = TimeDelta::Millis(10);
EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded); EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded);
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
TimeDelta expected_total_processing_delay = TimeDelta::Millis(0); TimeDelta expected_total_processing_delay = TimeDelta::Zero();
unsigned int expected_frames_decoded = 0; unsigned int expected_frames_decoded = 0;
// We set receive time fixed and increase the clock by 10ms // We set receive time fixed and increase the clock by 10ms
// in the loop which will increase the processing delay by // in the loop which will increase the processing delay by
@ -220,7 +217,7 @@ TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameIncreasesAssemblyTime) {
const TimeDelta kAssemblyTime = TimeDelta::Millis(7); const TimeDelta kAssemblyTime = TimeDelta::Millis(7);
EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded); EXPECT_EQ(0u, statistics_proxy_->GetStats().frames_decoded);
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
TimeDelta expected_total_assembly_time = TimeDelta::Millis(0); TimeDelta expected_total_assembly_time = TimeDelta::Zero();
unsigned int expected_frames_decoded = 0; unsigned int expected_frames_decoded = 0;
unsigned int expected_frames_assembled_from_multiple_packets = 0; unsigned int expected_frames_assembled_from_multiple_packets = 0;
@ -285,10 +282,10 @@ TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameIncreasesAssemblyTime) {
TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameIncreasesQpSum) { TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameIncreasesQpSum) {
EXPECT_EQ(absl::nullopt, statistics_proxy_->GetStats().qp_sum); EXPECT_EQ(absl::nullopt, statistics_proxy_->GetStats().qp_sum);
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(3u, FlushAndGetStats().qp_sum); EXPECT_EQ(3u, FlushAndGetStats().qp_sum);
statistics_proxy_->OnDecodedFrame(frame, 127u, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, 127u, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(130u, FlushAndGetStats().qp_sum); EXPECT_EQ(130u, FlushAndGetStats().qp_sum);
} }
@ -310,11 +307,11 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsContentType) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
EXPECT_EQ(kRealtimeString, videocontenttypehelpers::ToString( EXPECT_EQ(kRealtimeString, videocontenttypehelpers::ToString(
statistics_proxy_->GetStats().content_type)); statistics_proxy_->GetStats().content_type));
statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Zero(),
VideoContentType::SCREENSHARE); VideoContentType::SCREENSHARE);
EXPECT_EQ(kScreenshareString, EXPECT_EQ(kScreenshareString,
videocontenttypehelpers::ToString(FlushAndGetStats().content_type)); videocontenttypehelpers::ToString(FlushAndGetStats().content_type));
statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(kRealtimeString, EXPECT_EQ(kRealtimeString,
videocontenttypehelpers::ToString(FlushAndGetStats().content_type)); videocontenttypehelpers::ToString(FlushAndGetStats().content_type));
@ -332,7 +329,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsMaxTotalInterFrameDelay) {
EXPECT_EQ(expected_total_squared_inter_frame_delay, EXPECT_EQ(expected_total_squared_inter_frame_delay,
statistics_proxy_->GetStats().total_squared_inter_frame_delay); statistics_proxy_->GetStats().total_squared_inter_frame_delay);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_DOUBLE_EQ(expected_total_inter_frame_delay, EXPECT_DOUBLE_EQ(expected_total_inter_frame_delay,
FlushAndGetStats().total_inter_frame_delay); FlushAndGetStats().total_inter_frame_delay);
@ -340,7 +337,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsMaxTotalInterFrameDelay) {
FlushAndGetStats().total_squared_inter_frame_delay); FlushAndGetStats().total_squared_inter_frame_delay);
fake_clock_.AdvanceTime(kInterFrameDelay1); fake_clock_.AdvanceTime(kInterFrameDelay1);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
expected_total_inter_frame_delay += kInterFrameDelay1.seconds<double>(); expected_total_inter_frame_delay += kInterFrameDelay1.seconds<double>();
expected_total_squared_inter_frame_delay += expected_total_squared_inter_frame_delay +=
@ -352,7 +349,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsMaxTotalInterFrameDelay) {
statistics_proxy_->GetStats().total_squared_inter_frame_delay); statistics_proxy_->GetStats().total_squared_inter_frame_delay);
fake_clock_.AdvanceTime(kInterFrameDelay2); fake_clock_.AdvanceTime(kInterFrameDelay2);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
expected_total_inter_frame_delay += kInterFrameDelay2.seconds<double>(); expected_total_inter_frame_delay += kInterFrameDelay2.seconds<double>();
expected_total_squared_inter_frame_delay += expected_total_squared_inter_frame_delay +=
@ -364,7 +361,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsMaxTotalInterFrameDelay) {
statistics_proxy_->GetStats().total_squared_inter_frame_delay); statistics_proxy_->GetStats().total_squared_inter_frame_delay);
fake_clock_.AdvanceTime(kInterFrameDelay3); fake_clock_.AdvanceTime(kInterFrameDelay3);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
expected_total_inter_frame_delay += kInterFrameDelay3.seconds<double>(); expected_total_inter_frame_delay += kInterFrameDelay3.seconds<double>();
expected_total_squared_inter_frame_delay += expected_total_squared_inter_frame_delay +=
@ -382,22 +379,22 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsMaxInterframeDelay) {
const int64_t kInterframeDelayMs2 = 200; const int64_t kInterframeDelayMs2 = 200;
const int64_t kInterframeDelayMs3 = 100; const int64_t kInterframeDelayMs3 = 100;
EXPECT_EQ(-1, statistics_proxy_->GetStats().interframe_delay_max_ms); EXPECT_EQ(-1, statistics_proxy_->GetStats().interframe_delay_max_ms);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(-1, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(-1, FlushAndGetStats().interframe_delay_max_ms);
fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs1); fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs1);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(kInterframeDelayMs1, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(kInterframeDelayMs1, FlushAndGetStats().interframe_delay_max_ms);
fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs2); fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs2);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(kInterframeDelayMs2, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(kInterframeDelayMs2, FlushAndGetStats().interframe_delay_max_ms);
fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs3); fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs3);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// kInterframeDelayMs3 is smaller than kInterframeDelayMs2. // kInterframeDelayMs3 is smaller than kInterframeDelayMs2.
EXPECT_EQ(kInterframeDelayMs2, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(kInterframeDelayMs2, FlushAndGetStats().interframe_delay_max_ms);
@ -409,23 +406,23 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportInterframeDelayInWindow) {
const int64_t kInterframeDelayMs2 = 750; const int64_t kInterframeDelayMs2 = 750;
const int64_t kInterframeDelayMs3 = 700; const int64_t kInterframeDelayMs3 = 700;
EXPECT_EQ(-1, statistics_proxy_->GetStats().interframe_delay_max_ms); EXPECT_EQ(-1, statistics_proxy_->GetStats().interframe_delay_max_ms);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(-1, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(-1, FlushAndGetStats().interframe_delay_max_ms);
fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs1); fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs1);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(kInterframeDelayMs1, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(kInterframeDelayMs1, FlushAndGetStats().interframe_delay_max_ms);
fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs2); fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs2);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Still first delay is the maximum // Still first delay is the maximum
EXPECT_EQ(kInterframeDelayMs1, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(kInterframeDelayMs1, FlushAndGetStats().interframe_delay_max_ms);
fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs3); fake_clock_.AdvanceTimeMilliseconds(kInterframeDelayMs3);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Now the first sample is out of the window, so the second is the maximum. // Now the first sample is out of the window, so the second is the maximum.
EXPECT_EQ(kInterframeDelayMs2, FlushAndGetStats().interframe_delay_max_ms); EXPECT_EQ(kInterframeDelayMs2, FlushAndGetStats().interframe_delay_max_ms);
@ -535,7 +532,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ReportsSumSquaredFrameDurations) {
TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameWithoutQpQpSumWontExist) { TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameWithoutQpQpSumWontExist) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
EXPECT_EQ(absl::nullopt, statistics_proxy_->GetStats().qp_sum); EXPECT_EQ(absl::nullopt, statistics_proxy_->GetStats().qp_sum);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(absl::nullopt, FlushAndGetStats().qp_sum); EXPECT_EQ(absl::nullopt, FlushAndGetStats().qp_sum);
} }
@ -543,10 +540,10 @@ TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameWithoutQpQpSumWontExist) {
TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameWithoutQpResetsQpSum) { TEST_F(ReceiveStatisticsProxy2Test, OnDecodedFrameWithoutQpResetsQpSum) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
EXPECT_EQ(absl::nullopt, statistics_proxy_->GetStats().qp_sum); EXPECT_EQ(absl::nullopt, statistics_proxy_->GetStats().qp_sum);
statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, 3u, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(3u, FlushAndGetStats().qp_sum); EXPECT_EQ(3u, FlushAndGetStats().qp_sum);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
EXPECT_EQ(absl::nullopt, FlushAndGetStats().qp_sum); EXPECT_EQ(absl::nullopt, FlushAndGetStats().qp_sum);
} }
@ -1017,8 +1014,7 @@ TEST_F(ReceiveStatisticsProxy2Test, DoesNotReportStaleFramerates) {
// Since OnRenderedFrame is never called the fps in each sample will be 0, // Since OnRenderedFrame is never called the fps in each sample will be 0,
// i.e. bad // i.e. bad
frame.set_ntp_time_ms(fake_clock_.CurrentNtpInMilliseconds()); frame.set_ntp_time_ms(fake_clock_.CurrentNtpInMilliseconds());
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
statistics_proxy_->OnRenderedFrame(MetaData(frame)); statistics_proxy_->OnRenderedFrame(MetaData(frame));
fake_clock_.AdvanceTimeMilliseconds(1000 / kDefaultFps); fake_clock_.AdvanceTimeMilliseconds(1000 / kDefaultFps);
@ -1087,7 +1083,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ReceivedFrameHistogramsAreUpdated) {
TEST_F(ReceiveStatisticsProxy2Test, ZeroDelayReportedIfFrameNotDelayed) { TEST_F(ReceiveStatisticsProxy2Test, ZeroDelayReportedIfFrameNotDelayed) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Frame not delayed, delayed frames to render: 0%. // Frame not delayed, delayed frames to render: 0%.
@ -1108,7 +1104,7 @@ TEST_F(ReceiveStatisticsProxy2Test, ZeroDelayReportedIfFrameNotDelayed) {
TEST_F(ReceiveStatisticsProxy2Test, TEST_F(ReceiveStatisticsProxy2Test,
DelayedFrameHistogramsAreNotUpdatedIfMinRuntimeHasNotPassed) { DelayedFrameHistogramsAreNotUpdatedIfMinRuntimeHasNotPassed) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Frame not delayed, delayed frames to render: 0%. // Frame not delayed, delayed frames to render: 0%.
@ -1129,7 +1125,7 @@ TEST_F(ReceiveStatisticsProxy2Test,
TEST_F(ReceiveStatisticsProxy2Test, TEST_F(ReceiveStatisticsProxy2Test,
DelayedFramesHistogramsAreNotUpdatedIfNoRenderedFrames) { DelayedFramesHistogramsAreNotUpdatedIfNoRenderedFrames) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Min run time has passed. No rendered frames. // Min run time has passed. No rendered frames.
@ -1144,7 +1140,7 @@ TEST_F(ReceiveStatisticsProxy2Test,
TEST_F(ReceiveStatisticsProxy2Test, DelayReportedIfFrameIsDelayed) { TEST_F(ReceiveStatisticsProxy2Test, DelayReportedIfFrameIsDelayed) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Frame delayed 1 ms, delayed frames to render: 100%. // Frame delayed 1 ms, delayed frames to render: 100%.
@ -1167,7 +1163,7 @@ TEST_F(ReceiveStatisticsProxy2Test, DelayReportedIfFrameIsDelayed) {
TEST_F(ReceiveStatisticsProxy2Test, AverageDelayOfDelayedFramesIsReported) { TEST_F(ReceiveStatisticsProxy2Test, AverageDelayOfDelayedFramesIsReported) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
VideoContentType::UNSPECIFIED); VideoContentType::UNSPECIFIED);
// Two frames delayed (6 ms, 10 ms), delayed frames to render: 50%. // Two frames delayed (6 ms, 10 ms), delayed frames to render: 50%.
@ -1319,13 +1315,13 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, InterFrameDelaysAreReported) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (int i = 0; i < kMinRequiredSamples; ++i) { for (int i = 0; i < kMinRequiredSamples; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
// One extra with double the interval. // One extra with double the interval.
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
content_type_); content_type_);
FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr); FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr);
@ -1356,18 +1352,18 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent,
for (int i = 0; i <= kMinRequiredSamples - kLastFivePercentsSamples; ++i) { for (int i = 0; i <= kMinRequiredSamples - kLastFivePercentsSamples; ++i) {
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
} }
// Last 5% of intervals are double in size. // Last 5% of intervals are double in size.
for (int i = 0; i < kLastFivePercentsSamples; ++i) { for (int i = 0; i < kLastFivePercentsSamples; ++i) {
fake_clock_.AdvanceTimeMilliseconds(2 * kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(2 * kInterFrameDelayMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
} }
// Final sample is outlier and 10 times as big. // Final sample is outlier and 10 times as big.
fake_clock_.AdvanceTimeMilliseconds(10 * kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(10 * kInterFrameDelayMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
content_type_); content_type_);
FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr); FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr);
@ -1390,8 +1386,8 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent,
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (int i = 0; i < kMinRequiredSamples; ++i) { for (int i = 0; i < kMinRequiredSamples; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
@ -1414,8 +1410,8 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent,
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (int i = 0; i <= kMinRequiredSamples; ++i) { for (int i = 0; i <= kMinRequiredSamples; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
@ -1427,10 +1423,10 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent,
// Insert two more frames. The interval during the pause should be // Insert two more frames. The interval during the pause should be
// disregarded in the stats. // disregarded in the stats.
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
content_type_); content_type_);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
content_type_); content_type_);
FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr); FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr);
@ -1466,18 +1462,18 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, FreezesAreReported) {
for (int i = 0; i < kMinRequiredSamples; ++i) { for (int i = 0; i < kMinRequiredSamples; ++i) {
VideoFrameMetaData meta = MetaData(frame); VideoFrameMetaData meta = MetaData(frame);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, absl::nullopt, TimeDelta::Zero(),
meta, absl::nullopt, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
// Add extra freeze. // Add extra freeze.
fake_clock_.AdvanceTimeMilliseconds(kFreezeDelayMs); fake_clock_.AdvanceTimeMilliseconds(kFreezeDelayMs);
VideoFrameMetaData meta = MetaData(frame); VideoFrameMetaData meta = MetaData(frame);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, absl::nullopt, TimeDelta::Zero(),
meta, absl::nullopt, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr); FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr);
@ -1515,8 +1511,8 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, HarmonicFrameRateIsReported) {
for (int i = 0; i < kMinRequiredSamples; ++i) { for (int i = 0; i < kMinRequiredSamples; ++i) {
fake_clock_.AdvanceTimeMilliseconds(kFrameDurationMs); fake_clock_.AdvanceTimeMilliseconds(kFrameDurationMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(MetaData(frame)); statistics_proxy_->OnRenderedFrame(MetaData(frame));
} }
@ -1524,7 +1520,7 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, HarmonicFrameRateIsReported) {
// Add freeze. // Add freeze.
loop_.Flush(); loop_.Flush();
fake_clock_.AdvanceTimeMilliseconds(kFreezeDurationMs); fake_clock_.AdvanceTimeMilliseconds(kFreezeDurationMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(MetaData(frame)); statistics_proxy_->OnRenderedFrame(MetaData(frame));
@ -1532,7 +1528,7 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, HarmonicFrameRateIsReported) {
loop_.Flush(); loop_.Flush();
fake_clock_.AdvanceTimeMilliseconds(kPauseDurationMs); fake_clock_.AdvanceTimeMilliseconds(kPauseDurationMs);
statistics_proxy_->OnStreamInactive(); statistics_proxy_->OnStreamInactive();
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(MetaData(frame)); statistics_proxy_->OnRenderedFrame(MetaData(frame));
@ -1563,9 +1559,9 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, PausesAreIgnored) {
for (int i = 0; i <= kMinRequiredSamples; ++i) { for (int i = 0; i <= kMinRequiredSamples; ++i) {
VideoFrameMetaData meta = MetaData(frame); VideoFrameMetaData meta = MetaData(frame);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, absl::nullopt, TimeDelta::Zero(),
meta, absl::nullopt, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
@ -1575,9 +1571,9 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, PausesAreIgnored) {
// Second playback interval with triple the length. // Second playback interval with triple the length.
for (int i = 0; i <= kMinRequiredSamples * 3; ++i) { for (int i = 0; i <= kMinRequiredSamples * 3; ++i) {
VideoFrameMetaData meta = MetaData(frame); VideoFrameMetaData meta = MetaData(frame);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, absl::nullopt, TimeDelta::Zero(),
meta, absl::nullopt, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
@ -1607,15 +1603,15 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, ManyPausesAtTheBeginning) {
webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight); webrtc::VideoFrame frame = CreateFrame(kWidth, kHeight);
for (int i = 0; i <= kMinRequiredSamples; ++i) { for (int i = 0; i <= kMinRequiredSamples; ++i) {
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
statistics_proxy_->OnStreamInactive(); statistics_proxy_->OnStreamInactive();
fake_clock_.AdvanceTimeMilliseconds(kPauseDurationMs); fake_clock_.AdvanceTimeMilliseconds(kPauseDurationMs);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
@ -1640,18 +1636,18 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, TimeInHdReported) {
// HD frames. // HD frames.
for (int i = 0; i < kMinRequiredSamples; ++i) { for (int i = 0; i < kMinRequiredSamples; ++i) {
VideoFrameMetaData meta = MetaData(frame_hd); VideoFrameMetaData meta = MetaData(frame_hd);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, absl::nullopt, TimeDelta::Zero(),
meta, absl::nullopt, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
// SD frames. // SD frames.
for (int i = 0; i < 2 * kMinRequiredSamples; ++i) { for (int i = 0; i < 2 * kMinRequiredSamples; ++i) {
VideoFrameMetaData meta = MetaData(frame_sd); VideoFrameMetaData meta = MetaData(frame_sd);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, absl::nullopt, TimeDelta::Zero(),
meta, absl::nullopt, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
@ -1680,23 +1676,23 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, TimeInBlockyVideoReported) {
// High quality frames. // High quality frames.
for (int i = 0; i < kMinRequiredSamples; ++i) { for (int i = 0; i < kMinRequiredSamples; ++i) {
VideoFrameMetaData meta = MetaData(frame); VideoFrameMetaData meta = MetaData(frame);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, kLowQp, TimeDelta::Zero(),
meta, kLowQp, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
// Blocky frames. // Blocky frames.
for (int i = 0; i < 2 * kMinRequiredSamples; ++i) { for (int i = 0; i < 2 * kMinRequiredSamples; ++i) {
VideoFrameMetaData meta = MetaData(frame); VideoFrameMetaData meta = MetaData(frame);
statistics_proxy_->OnDecodedFrame( statistics_proxy_->OnDecodedFrame(meta, kHighQp, TimeDelta::Zero(),
meta, kHighQp, TimeDelta::Millis(0), webrtc::TimeDelta::Millis(0), TimeDelta::Zero(), TimeDelta::Zero(),
webrtc::TimeDelta::Millis(0), content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(meta); statistics_proxy_->OnRenderedFrame(meta);
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs);
} }
// Extra last frame. // Extra last frame.
statistics_proxy_->OnDecodedFrame(frame, kHighQp, TimeDelta::Millis(0), statistics_proxy_->OnDecodedFrame(frame, kHighQp, TimeDelta::Zero(),
content_type_); content_type_);
statistics_proxy_->OnRenderedFrame(MetaData(frame)); statistics_proxy_->OnRenderedFrame(MetaData(frame));
@ -1722,8 +1718,8 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent, DownscalesReported) {
webrtc::VideoFrame frame_ld = CreateFrame(320, 180); webrtc::VideoFrame frame_ld = CreateFrame(320, 180);
// Call once to pass content type. // Call once to pass content type.
statistics_proxy_->OnDecodedFrame(frame_hd, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame_hd, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type_); content_type_);
loop_.Flush(); loop_.Flush();
statistics_proxy_->OnRenderedFrame(MetaData(frame_hd)); statistics_proxy_->OnRenderedFrame(MetaData(frame_hd));
@ -1781,15 +1777,15 @@ TEST_P(ReceiveStatisticsProxy2TestWithContent,
videocontenttypehelpers::SetSimulcastId(&content_type, 1); videocontenttypehelpers::SetSimulcastId(&content_type, 1);
for (int i = 0; i <= kMinRequiredSamples; ++i) { for (int i = 0; i <= kMinRequiredSamples; ++i) {
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs1); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs1);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type); content_type);
} }
videocontenttypehelpers::SetSimulcastId(&content_type, 2); videocontenttypehelpers::SetSimulcastId(&content_type, 2);
for (int i = 0; i <= kMinRequiredSamples; ++i) { for (int i = 0; i <= kMinRequiredSamples; ++i) {
fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs2); fake_clock_.AdvanceTimeMilliseconds(kInterFrameDelayMs2);
statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, statistics_proxy_->OnDecodedFrame(frame, absl::nullopt, TimeDelta::Zero(),
TimeDelta::Millis(0), content_type); content_type);
} }
FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr); FlushAndUpdateHistograms(absl::nullopt, StreamDataCounters(), nullptr);

4
video/video_stream_encoder_unittest.cc
View file

@ -746,7 +746,7 @@ class SimpleVideoStreamEncoderFactory {
}; };
test::ScopedKeyValueConfig field_trials_; test::ScopedKeyValueConfig field_trials_;
GlobalSimulatedTimeController time_controller_{Timestamp::Millis(0)}; GlobalSimulatedTimeController time_controller_{Timestamp::Zero()};
std::unique_ptr<TaskQueueFactory> task_queue_factory_{ std::unique_ptr<TaskQueueFactory> task_queue_factory_{
time_controller_.CreateTaskQueueFactory()}; time_controller_.CreateTaskQueueFactory()};
std::unique_ptr<MockableSendStatisticsProxy> stats_proxy_ = std::unique_ptr<MockableSendStatisticsProxy> stats_proxy_ =
@ -9116,7 +9116,7 @@ TEST(VideoStreamEncoderSimpleTest, CreateDestroy) {
// Lots of boiler plate. // Lots of boiler plate.
test::ScopedKeyValueConfig field_trials; test::ScopedKeyValueConfig field_trials;
GlobalSimulatedTimeController time_controller(Timestamp::Millis(0)); GlobalSimulatedTimeController time_controller(Timestamp::Zero());
auto stats_proxy = std::make_unique<MockableSendStatisticsProxy>( auto stats_proxy = std::make_unique<MockableSendStatisticsProxy>(
time_controller.GetClock(), VideoSendStream::Config(nullptr), time_controller.GetClock(), VideoSendStream::Config(nullptr),
webrtc::VideoEncoderConfig::ContentType::kRealtimeVideo, field_trials); webrtc::VideoEncoderConfig::ContentType::kRealtimeVideo, field_trials);