Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: webrtc/pc/rtcstatscollector_unittest.cc

Issue 2675943002: RTCInboundRTPStreamStats.qpSum collected. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« webrtc/api/stats/rtcstats.h ('K') | « webrtc/pc/rtcstatscollector.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 1748 matching lines...) Expand 10 before | Expand all | Expand 10 after
1759 video_media_info.receivers[0].local_stats[0].ssrc = 1; 1759 video_media_info.receivers[0].local_stats[0].ssrc = 1;
1760 video_media_info.receivers[0].packets_rcvd = 2; 1760 video_media_info.receivers[0].packets_rcvd = 2;
1761 video_media_info.receivers[0].packets_lost = 42; 1761 video_media_info.receivers[0].packets_lost = 42;
1762 video_media_info.receivers[0].bytes_rcvd = 3; 1762 video_media_info.receivers[0].bytes_rcvd = 3;
1763 video_media_info.receivers[0].fraction_lost = 4.5f; 1763 video_media_info.receivers[0].fraction_lost = 4.5f;
1764 video_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); 1764 video_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42);
1765 video_media_info.receivers[0].firs_sent = 5; 1765 video_media_info.receivers[0].firs_sent = 5;
1766 video_media_info.receivers[0].plis_sent = 6; 1766 video_media_info.receivers[0].plis_sent = 6;
1767 video_media_info.receivers[0].nacks_sent = 7; 1767 video_media_info.receivers[0].nacks_sent = 7;
1768 video_media_info.receivers[0].frames_decoded = 8; 1768 video_media_info.receivers[0].frames_decoded = 8;
1769 video_media_info.receivers[0].qp_sum = rtc::Optional<uint64_t>(9);
1769 1770
1770 RtpCodecParameters codec_parameters; 1771 RtpCodecParameters codec_parameters;
1771 codec_parameters.payload_type = 42; 1772 codec_parameters.payload_type = 42;
1772 codec_parameters.mime_type = "dummy"; 1773 codec_parameters.mime_type = "dummy";
1773 codec_parameters.clock_rate = 0; 1774 codec_parameters.clock_rate = 0;
1774 video_media_info.receive_codecs.insert( 1775 video_media_info.receive_codecs.insert(
1775 std::make_pair(codec_parameters.payload_type, codec_parameters)); 1776 std::make_pair(codec_parameters.payload_type, codec_parameters));
1776 1777
1777 EXPECT_CALL(*video_media_channel, GetStats(_)) 1778 EXPECT_CALL(*video_media_channel, GetStats(_))
1778 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); 1779 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true)));
(...skipping 29 matching lines...) Expand all
1808 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); 1809 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP);
1809 expected_video.codec_id = "RTCCodec_InboundVideo_42"; 1810 expected_video.codec_id = "RTCCodec_InboundVideo_42";
1810 expected_video.fir_count = 5; 1811 expected_video.fir_count = 5;
1811 expected_video.pli_count = 6; 1812 expected_video.pli_count = 6;
1812 expected_video.nack_count = 7; 1813 expected_video.nack_count = 7;
1813 expected_video.packets_received = 2; 1814 expected_video.packets_received = 2;
1814 expected_video.bytes_received = 3; 1815 expected_video.bytes_received = 3;
1815 expected_video.packets_lost = 42; 1816 expected_video.packets_lost = 42;
1816 expected_video.fraction_lost = 4.5; 1817 expected_video.fraction_lost = 4.5;
1817 expected_video.frames_decoded = 8; 1818 expected_video.frames_decoded = 8;
1819 expected_video.qp_sum = 9;
1818 1820
1819 ASSERT_TRUE(report->Get(expected_video.id())); 1821 ASSERT_TRUE(report->Get(expected_video.id()));
1820 const RTCInboundRTPStreamStats& video = report->Get( 1822 const RTCInboundRTPStreamStats& video = report->Get(
1821 expected_video.id())->cast_to<RTCInboundRTPStreamStats>(); 1823 expected_video.id())->cast_to<RTCInboundRTPStreamStats>();
1822 EXPECT_EQ(video, expected_video); 1824 EXPECT_EQ(video, expected_video);
1823 1825
1824 EXPECT_TRUE(report->Get(*expected_video.track_id)); 1826 EXPECT_TRUE(report->Get(*expected_video.track_id));
1825 EXPECT_TRUE(report->Get(*expected_video.transport_id)); 1827 EXPECT_TRUE(report->Get(*expected_video.transport_id));
1826 EXPECT_TRUE(report->Get(*video.codec_id)); 1828 EXPECT_TRUE(report->Get(*video.codec_id));
1827 } 1829 }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); 1918 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo());
1917 video_media_info.senders[0].local_stats[0].ssrc = 1; 1919 video_media_info.senders[0].local_stats[0].ssrc = 1;
1918 video_media_info.senders[0].firs_rcvd = 2; 1920 video_media_info.senders[0].firs_rcvd = 2;
1919 video_media_info.senders[0].plis_rcvd = 3; 1921 video_media_info.senders[0].plis_rcvd = 3;
1920 video_media_info.senders[0].nacks_rcvd = 4; 1922 video_media_info.senders[0].nacks_rcvd = 4;
1921 video_media_info.senders[0].packets_sent = 5; 1923 video_media_info.senders[0].packets_sent = 5;
1922 video_media_info.senders[0].bytes_sent = 6; 1924 video_media_info.senders[0].bytes_sent = 6;
1923 video_media_info.senders[0].rtt_ms = 7500; 1925 video_media_info.senders[0].rtt_ms = 7500;
1924 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); 1926 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42);
1925 video_media_info.senders[0].frames_encoded = 8; 1927 video_media_info.senders[0].frames_encoded = 8;
1926 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(16); 1928 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>();
1927 1929
1928 RtpCodecParameters codec_parameters; 1930 RtpCodecParameters codec_parameters;
1929 codec_parameters.payload_type = 42; 1931 codec_parameters.payload_type = 42;
1930 codec_parameters.mime_type = "dummy"; 1932 codec_parameters.mime_type = "dummy";
1931 codec_parameters.clock_rate = 0; 1933 codec_parameters.clock_rate = 0;
1932 video_media_info.send_codecs.insert( 1934 video_media_info.send_codecs.insert(
1933 std::make_pair(codec_parameters.payload_type, codec_parameters)); 1935 std::make_pair(codec_parameters.payload_type, codec_parameters));
1934 1936
1935 EXPECT_CALL(*video_media_channel, GetStats(_)) 1937 EXPECT_CALL(*video_media_channel, GetStats(_))
1936 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); 1938 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true)));
(...skipping 28 matching lines...) Expand all
1965 expected_video.transport_id = "RTCTransport_TransportName_" + 1967 expected_video.transport_id = "RTCTransport_TransportName_" +
1966 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); 1968 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP);
1967 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; 1969 expected_video.codec_id = "RTCCodec_OutboundVideo_42";
1968 expected_video.fir_count = 2; 1970 expected_video.fir_count = 2;
1969 expected_video.pli_count = 3; 1971 expected_video.pli_count = 3;
1970 expected_video.nack_count = 4; 1972 expected_video.nack_count = 4;
1971 expected_video.packets_sent = 5; 1973 expected_video.packets_sent = 5;
1972 expected_video.bytes_sent = 6; 1974 expected_video.bytes_sent = 6;
1973 expected_video.round_trip_time = 7.5; 1975 expected_video.round_trip_time = 7.5;
1974 expected_video.frames_encoded = 8; 1976 expected_video.frames_encoded = 8;
1975 expected_video.qp_sum = 16; 1977 // |expected_video.qp_sum| should be undefined.
1976 1978
1977 ASSERT_TRUE(report->Get(expected_video.id())); 1979 ASSERT_TRUE(report->Get(expected_video.id()));
1978 const RTCOutboundRTPStreamStats& video = report->Get( 1980 EXPECT_EQ(
1979 expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(); 1981 report->Get(expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(),
1980 EXPECT_EQ(video, expected_video); 1982 expected_video);
1981 1983
1982 EXPECT_TRUE(report->Get(*expected_video.track_id)); 1984 EXPECT_TRUE(report->Get(*expected_video.track_id));
1983 EXPECT_TRUE(report->Get(*expected_video.transport_id)); 1985 EXPECT_TRUE(report->Get(*expected_video.transport_id));
1984 EXPECT_TRUE(report->Get(*expected_video.codec_id)); 1986 EXPECT_TRUE(report->Get(*expected_video.codec_id));
1987
1988 // Set previously undefined values and "GetStats" again.
1989 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(9);
1990 expected_video.qp_sum = 9;
1991
1992 EXPECT_CALL(*video_media_channel, GetStats(_))
1993 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true)));
1994 collector_->ClearCachedStatsReport();
1995 report = GetStatsReport();
1996 expected_video.set_timestamp_us_for_testing(report->timestamp_us());
1997
1998 ASSERT_TRUE(report->Get(expected_video.id()));
1999 EXPECT_EQ(
2000 report->Get(expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(),
2001 expected_video);
1985 } 2002 }
1986 2003
1987 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Default) { 2004 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Default) {
1988 MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel(); 2005 MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel();
1989 cricket::VoiceChannel voice_channel( 2006 cricket::VoiceChannel voice_channel(
1990 test_->worker_thread(), test_->network_thread(), 2007 test_->worker_thread(), test_->network_thread(),
1991 test_->signaling_thread(), test_->media_engine(), voice_media_channel, 2008 test_->signaling_thread(), test_->media_engine(), voice_media_channel,
1992 "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired); 2009 "VoiceContentName", kDefaultRtcpMuxRequired, kDefaultSrtpRequired);
1993 MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel(); 2010 MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel();
1994 cricket::VideoChannel video_channel( 2011 cricket::VideoChannel video_channel(
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
2257 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; 2274 rtc::scoped_refptr<FakeRTCStatsCollector> collector_;
2258 }; 2275 };
2259 2276
2260 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { 2277 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) {
2261 collector_->VerifyThreadUsageAndResultsMerging(); 2278 collector_->VerifyThreadUsageAndResultsMerging();
2262 } 2279 }
2263 2280
2264 } // namespace 2281 } // namespace
2265 2282
2266 } // namespace webrtc 2283 } // namespace webrtc
OLDNEW
« webrtc/api/stats/rtcstats.h ('K') | « webrtc/pc/rtcstatscollector.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698