From a51d4f34d950b4f31bb0db19cbbb936620e334ab Mon Sep 17 00:00:00 2001 From: hbos Date: Thu, 16 Feb 2017 05:34:48 -0800 Subject: [PATCH] Re-land of RTCInboundRTPStreamStats.qpSum collected. This was previously only collected for local tracks (RTCOutboundRTPStreamStats.qpSum). Spec: https://w3c.github.io/webrtc-stats/#dom-rtcrtpstreamstats-qpsum This CL also improves some testing in rtcstatscollector_unittest.cc. Default and non-default values are tested in the same unittests, removing the test that was specific to default-values, which was otherwise code duplication. This is a re-land of https://codereview.webrtc.org/2675943002 after dependent CL that was re-landed. BUG=webrtc:7065 TBR=hta@webrtc.org, sakal@webrtc.org Review-Url: https://codereview.webrtc.org/2703503003 Cr-Commit-Position: refs/heads/master@{#16642} --- webrtc/api/stats/rtcstats_objects.h | 2 - webrtc/pc/rtcstats_integrationtest.cc | 9 +- webrtc/pc/rtcstatscollector.cc | 2 + webrtc/pc/rtcstatscollector_unittest.cc | 184 ++++++++---------------- 4 files changed, 72 insertions(+), 125 deletions(-) diff --git a/webrtc/api/stats/rtcstats_objects.h b/webrtc/api/stats/rtcstats_objects.h index 8fb73d10ab..dab947ec4e 100644 --- a/webrtc/api/stats/rtcstats_objects.h +++ b/webrtc/api/stats/rtcstats_objects.h @@ -323,8 +323,6 @@ class RTCRTPStreamStats : public RTCStats { // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/657854 // SLI count is only defined for |media_type == "video"|. RTCStatsMember sli_count; - // TODO(hbos): Only collected for the outbound case, should also be collected - // for inbound case by |RTCStatsCollector|. crbug.com/657854, crbug.com/657855 RTCStatsMember qp_sum; protected: diff --git a/webrtc/pc/rtcstats_integrationtest.cc b/webrtc/pc/rtcstats_integrationtest.cc index a20a909f1a..f27157be46 100644 --- a/webrtc/pc/rtcstats_integrationtest.cc +++ b/webrtc/pc/rtcstats_integrationtest.cc @@ -536,7 +536,14 @@ class RTCStatsReportVerifier { const RTCInboundRTPStreamStats& inbound_stream) { RTCStatsVerifier verifier(report_, &inbound_stream); VerifyRTCRTPStreamStats(inbound_stream, &verifier); - verifier.TestMemberIsUndefined(inbound_stream.qp_sum); + // TODO(hbos): As soon as the decoders provide |qp_sum| values, this + // if-statement needs to be included. https://bugs.webrtc.org/7065 + // if (inbound_stream.media_type.is_defined() && + // *inbound_stream.media_type == "video") { + // verifier.TestMemberIsNonNegative(inbound_stream.qp_sum); + // } else { + verifier.TestMemberIsUndefined(inbound_stream.qp_sum); + // } verifier.TestMemberIsNonNegative(inbound_stream.packets_received); verifier.TestMemberIsNonNegative(inbound_stream.bytes_received); verifier.TestMemberIsNonNegative(inbound_stream.packets_lost); diff --git a/webrtc/pc/rtcstatscollector.cc b/webrtc/pc/rtcstatscollector.cc index 5cdea0ca7d..99d7bc1c90 100644 --- a/webrtc/pc/rtcstatscollector.cc +++ b/webrtc/pc/rtcstatscollector.cc @@ -245,6 +245,8 @@ void SetInboundRTPStreamStatsFromVideoReceiverInfo( inbound_video->nack_count = static_cast(video_receiver_info.nacks_sent); inbound_video->frames_decoded = video_receiver_info.frames_decoded; + if (video_receiver_info.qp_sum) + inbound_video->qp_sum = *video_receiver_info.qp_sum; } // Provides the media independent counters (both audio and video). diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/webrtc/pc/rtcstatscollector_unittest.cc index adace3f4dd..3a4033ba27 100644 --- a/webrtc/pc/rtcstatscollector_unittest.cc +++ b/webrtc/pc/rtcstatscollector_unittest.cc @@ -1794,10 +1794,9 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) { expected_audio.fraction_lost = 5.5; ASSERT_TRUE(report->Get(expected_audio.id())); - const RTCInboundRTPStreamStats& audio = report->Get( - expected_audio.id())->cast_to(); - EXPECT_EQ(audio, expected_audio); - + EXPECT_EQ( + report->Get(expected_audio.id())->cast_to(), + expected_audio); EXPECT_TRUE(report->Get(*expected_audio.track_id)); EXPECT_TRUE(report->Get(*expected_audio.transport_id)); EXPECT_TRUE(report->Get(*expected_audio.codec_id)); @@ -1828,6 +1827,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) { video_media_info.receivers[0].plis_sent = 6; video_media_info.receivers[0].nacks_sent = 7; video_media_info.receivers[0].frames_decoded = 8; + video_media_info.receivers[0].qp_sum = rtc::Optional(); RtpCodecParameters codec_parameters; codec_parameters.payload_type = 42; @@ -1878,15 +1878,29 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) { expected_video.packets_lost = 42; expected_video.fraction_lost = 4.5; expected_video.frames_decoded = 8; + // |expected_video.qp_sum| should be undefined. ASSERT_TRUE(report->Get(expected_video.id())); - const RTCInboundRTPStreamStats& video = report->Get( - expected_video.id())->cast_to(); - EXPECT_EQ(video, expected_video); + EXPECT_EQ( + report->Get(expected_video.id())->cast_to(), + expected_video); + // Set previously undefined values and "GetStats" again. + video_media_info.receivers[0].qp_sum = rtc::Optional(9); + expected_video.qp_sum = 9; + + EXPECT_CALL(*video_media_channel, GetStats(_)) + .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); + collector_->ClearCachedStatsReport(); + report = GetStatsReport(); + + ASSERT_TRUE(report->Get(expected_video.id())); + EXPECT_EQ( + report->Get(expected_video.id())->cast_to(), + expected_video); EXPECT_TRUE(report->Get(*expected_video.track_id)); EXPECT_TRUE(report->Get(*expected_video.transport_id)); - EXPECT_TRUE(report->Get(*video.codec_id)); + EXPECT_TRUE(report->Get(*expected_video.codec_id)); } TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) { @@ -1906,7 +1920,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) { voice_media_info.senders[0].local_stats[0].ssrc = 1; voice_media_info.senders[0].packets_sent = 2; voice_media_info.senders[0].bytes_sent = 3; - voice_media_info.senders[0].rtt_ms = 4500; + voice_media_info.senders[0].rtt_ms = -1; voice_media_info.senders[0].codec_payload_type = rtc::Optional(42); RtpCodecParameters codec_parameters; @@ -1952,13 +1966,26 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) { expected_audio.codec_id = "RTCCodec_OutboundAudio_42"; expected_audio.packets_sent = 2; expected_audio.bytes_sent = 3; - expected_audio.round_trip_time = 4.5; + // |expected_audio.round_trip_time| should be undefined. ASSERT_TRUE(report->Get(expected_audio.id())); - const RTCOutboundRTPStreamStats& audio = report->Get( - expected_audio.id())->cast_to(); - EXPECT_EQ(audio, expected_audio); + EXPECT_EQ( + report->Get(expected_audio.id())->cast_to(), + expected_audio); + // Set previously undefined values and "GetStats" again. + voice_media_info.senders[0].rtt_ms = 4500; + expected_audio.round_trip_time = 4.5; + + EXPECT_CALL(*voice_media_channel, GetStats(_)) + .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); + collector_->ClearCachedStatsReport(); + report = GetStatsReport(); + + ASSERT_TRUE(report->Get(expected_audio.id())); + EXPECT_EQ( + report->Get(expected_audio.id())->cast_to(), + expected_audio); EXPECT_TRUE(report->Get(*expected_audio.track_id)); EXPECT_TRUE(report->Get(*expected_audio.transport_id)); EXPECT_TRUE(report->Get(*expected_audio.codec_id)); @@ -1984,10 +2011,10 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) { video_media_info.senders[0].nacks_rcvd = 4; video_media_info.senders[0].packets_sent = 5; video_media_info.senders[0].bytes_sent = 6; - video_media_info.senders[0].rtt_ms = 7500; + video_media_info.senders[0].rtt_ms = -1; video_media_info.senders[0].codec_payload_type = rtc::Optional(42); video_media_info.senders[0].frames_encoded = 8; - video_media_info.senders[0].qp_sum = rtc::Optional(16); + video_media_info.senders[0].qp_sum = rtc::Optional(); RtpCodecParameters codec_parameters; codec_parameters.payload_type = 42; @@ -2035,122 +2062,35 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) { expected_video.nack_count = 4; expected_video.packets_sent = 5; expected_video.bytes_sent = 6; - expected_video.round_trip_time = 7.5; expected_video.frames_encoded = 8; - expected_video.qp_sum = 16; + // |expected_video.round_trip_time| and |expected_video.qp_sum| should be + // undefined. ASSERT_TRUE(report->Get(expected_video.id())); - const RTCOutboundRTPStreamStats& video = report->Get( - expected_video.id())->cast_to(); - EXPECT_EQ(video, expected_video); + EXPECT_EQ( + report->Get(expected_video.id())->cast_to(), + expected_video); + // Set previously undefined values and "GetStats" again. + video_media_info.senders[0].rtt_ms = 7500; + video_media_info.senders[0].qp_sum = rtc::Optional(9); + expected_video.round_trip_time = 7.5; + expected_video.qp_sum = 9; + + EXPECT_CALL(*video_media_channel, GetStats(_)) + .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); + collector_->ClearCachedStatsReport(); + report = GetStatsReport(); + + ASSERT_TRUE(report->Get(expected_video.id())); + EXPECT_EQ( + report->Get(expected_video.id())->cast_to(), + expected_video); EXPECT_TRUE(report->Get(*expected_video.track_id)); EXPECT_TRUE(report->Get(*expected_video.transport_id)); EXPECT_TRUE(report->Get(*expected_video.codec_id)); } -TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Default) { - MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel(); - cricket::VoiceChannel voice_channel( - test_->worker_thread(), test_->network_thread(), - test_->signaling_thread(), test_->media_engine(), voice_media_channel, - "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired); - MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel(); - cricket::VideoChannel video_channel( - test_->worker_thread(), test_->network_thread(), - test_->signaling_thread(), video_media_channel, "VideoContentName", - kDefaultRtcpMuxRequired, kDefaultSrtpRequired); - - cricket::VoiceMediaInfo voice_media_info; - voice_media_info.senders.push_back(cricket::VoiceSenderInfo()); - voice_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); - voice_media_info.senders[0].local_stats[0].ssrc = 1; - voice_media_info.senders[0].packets_sent = 2; - voice_media_info.senders[0].bytes_sent = 3; - voice_media_info.senders[0].rtt_ms = -1; - voice_media_info.senders[0].codec_payload_type = rtc::Optional(42); - - cricket::VideoMediaInfo video_media_info; - video_media_info.senders.push_back(cricket::VideoSenderInfo()); - video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); - video_media_info.senders[0].local_stats[0].ssrc = 1; - video_media_info.senders[0].firs_rcvd = 2; - video_media_info.senders[0].plis_rcvd = 3; - video_media_info.senders[0].nacks_rcvd = 4; - video_media_info.senders[0].packets_sent = 5; - video_media_info.senders[0].bytes_sent = 6; - video_media_info.senders[0].rtt_ms = -1; - video_media_info.senders[0].codec_payload_type = rtc::Optional(42); - video_media_info.senders[0].frames_encoded = 7; - - EXPECT_CALL(*voice_media_channel, GetStats(_)) - .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); - EXPECT_CALL(*video_media_channel, GetStats(_)) - .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); - - SessionStats session_stats; - session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; - session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; - session_stats.transport_stats["TransportName"].transport_name = - "TransportName"; - - // Make sure the associated |RTCTransportStats| is created. - cricket::TransportChannelStats channel_stats; - channel_stats.component = cricket::ICE_CANDIDATE_COMPONENT_RTP; - session_stats.transport_stats["TransportName"].channel_stats.push_back( - channel_stats); - - EXPECT_CALL(test_->session(), GetStats(_)).WillRepeatedly(Invoke( - [&session_stats](const ChannelNamePairs&) { - return std::unique_ptr(new SessionStats(session_stats)); - })); - EXPECT_CALL(test_->session(), voice_channel()) - .WillRepeatedly(Return(&voice_channel)); - EXPECT_CALL(test_->session(), video_channel()) - .WillRepeatedly(Return(&video_channel)); - - rtc::scoped_refptr report = GetStatsReport(); - - RTCOutboundRTPStreamStats expected_audio( - "RTCOutboundRTPAudioStream_1", report->timestamp_us()); - expected_audio.ssrc = 1; - expected_audio.is_remote = false; - expected_audio.media_type = "audio"; - expected_audio.transport_id = "RTCTransport_TransportName_" + - rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); - expected_audio.codec_id = "RTCCodec_OutboundAudio_42"; - expected_audio.packets_sent = 2; - expected_audio.bytes_sent = 3; - // |expected_audio.round_trip_time| should be undefined. - - ASSERT_TRUE(report->Get(expected_audio.id())); - const RTCOutboundRTPStreamStats& audio = report->Get( - expected_audio.id())->cast_to(); - EXPECT_EQ(audio, expected_audio); - - RTCOutboundRTPStreamStats expected_video( - "RTCOutboundRTPVideoStream_1", report->timestamp_us()); - expected_video.ssrc = 1; - expected_video.is_remote = false; - expected_video.media_type = "video"; - expected_video.transport_id = "RTCTransport_TransportName_" + - rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); - expected_video.codec_id = "RTCCodec_OutboundVideo_42"; - expected_video.fir_count = 2; - expected_video.pli_count = 3; - expected_video.nack_count = 4; - expected_video.packets_sent = 5; - expected_video.bytes_sent = 6; - expected_video.frames_encoded = 7; - // |expected_video.round_trip_time| should be undefined. - // |expected_video.qp_sum| should be undefined. - - ASSERT_TRUE(report->Get(expected_video.id())); - const RTCOutboundRTPStreamStats& video = report->Get( - expected_video.id())->cast_to(); - EXPECT_EQ(video, expected_video); -} - TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) { std::unique_ptr rtp_local_candidate = CreateFakeCandidate( "42.42.42.42", 42, "protocol", cricket::LOCAL_PORT_TYPE, 42);