OLD | NEW |
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 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1504 cricket::SsrcReceiverInfo()); | 1504 cricket::SsrcReceiverInfo()); |
1505 video_media_info.receivers[0].local_stats[0].ssrc = 1; | 1505 video_media_info.receivers[0].local_stats[0].ssrc = 1; |
1506 video_media_info.receivers[0].packets_rcvd = 2; | 1506 video_media_info.receivers[0].packets_rcvd = 2; |
1507 video_media_info.receivers[0].packets_lost = 42; | 1507 video_media_info.receivers[0].packets_lost = 42; |
1508 video_media_info.receivers[0].bytes_rcvd = 3; | 1508 video_media_info.receivers[0].bytes_rcvd = 3; |
1509 video_media_info.receivers[0].fraction_lost = 4.5f; | 1509 video_media_info.receivers[0].fraction_lost = 4.5f; |
1510 video_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); | 1510 video_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); |
1511 video_media_info.receivers[0].firs_sent = 5; | 1511 video_media_info.receivers[0].firs_sent = 5; |
1512 video_media_info.receivers[0].plis_sent = 6; | 1512 video_media_info.receivers[0].plis_sent = 6; |
1513 video_media_info.receivers[0].nacks_sent = 7; | 1513 video_media_info.receivers[0].nacks_sent = 7; |
| 1514 video_media_info.receivers[0].frames_decoded = 8; |
1514 | 1515 |
1515 RtpCodecParameters codec_parameters; | 1516 RtpCodecParameters codec_parameters; |
1516 codec_parameters.payload_type = 42; | 1517 codec_parameters.payload_type = 42; |
1517 codec_parameters.mime_type = "dummy"; | 1518 codec_parameters.mime_type = "dummy"; |
1518 codec_parameters.clock_rate = 0; | 1519 codec_parameters.clock_rate = 0; |
1519 video_media_info.receive_codecs.insert( | 1520 video_media_info.receive_codecs.insert( |
1520 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1521 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1521 | 1522 |
1522 EXPECT_CALL(*video_media_channel, GetStats(_)) | 1523 EXPECT_CALL(*video_media_channel, GetStats(_)) |
1523 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 1524 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
(...skipping 26 matching lines...) Expand all Loading... |
1550 expected_video.transport_id = "RTCTransport_TransportName_" + | 1551 expected_video.transport_id = "RTCTransport_TransportName_" + |
1551 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1552 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1552 expected_video.codec_id = "RTCCodec_InboundVideo_42"; | 1553 expected_video.codec_id = "RTCCodec_InboundVideo_42"; |
1553 expected_video.fir_count = 5; | 1554 expected_video.fir_count = 5; |
1554 expected_video.pli_count = 6; | 1555 expected_video.pli_count = 6; |
1555 expected_video.nack_count = 7; | 1556 expected_video.nack_count = 7; |
1556 expected_video.packets_received = 2; | 1557 expected_video.packets_received = 2; |
1557 expected_video.bytes_received = 3; | 1558 expected_video.bytes_received = 3; |
1558 expected_video.packets_lost = 42; | 1559 expected_video.packets_lost = 42; |
1559 expected_video.fraction_lost = 4.5; | 1560 expected_video.fraction_lost = 4.5; |
| 1561 expected_video.frames_decoded = 8; |
1560 | 1562 |
1561 ASSERT(report->Get(expected_video.id())); | 1563 ASSERT(report->Get(expected_video.id())); |
1562 const RTCInboundRTPStreamStats& video = report->Get( | 1564 const RTCInboundRTPStreamStats& video = report->Get( |
1563 expected_video.id())->cast_to<RTCInboundRTPStreamStats>(); | 1565 expected_video.id())->cast_to<RTCInboundRTPStreamStats>(); |
1564 EXPECT_EQ(video, expected_video); | 1566 EXPECT_EQ(video, expected_video); |
1565 | 1567 |
1566 ASSERT_TRUE(report->Get(*expected_video.transport_id)); | 1568 ASSERT_TRUE(report->Get(*expected_video.transport_id)); |
1567 ASSERT_TRUE(report->Get(*video.codec_id)); | 1569 ASSERT_TRUE(report->Get(*video.codec_id)); |
1568 } | 1570 } |
1569 | 1571 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1646 video_media_info.senders.push_back(cricket::VideoSenderInfo()); | 1648 video_media_info.senders.push_back(cricket::VideoSenderInfo()); |
1647 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); | 1649 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); |
1648 video_media_info.senders[0].local_stats[0].ssrc = 1; | 1650 video_media_info.senders[0].local_stats[0].ssrc = 1; |
1649 video_media_info.senders[0].firs_rcvd = 2; | 1651 video_media_info.senders[0].firs_rcvd = 2; |
1650 video_media_info.senders[0].plis_rcvd = 3; | 1652 video_media_info.senders[0].plis_rcvd = 3; |
1651 video_media_info.senders[0].nacks_rcvd = 4; | 1653 video_media_info.senders[0].nacks_rcvd = 4; |
1652 video_media_info.senders[0].packets_sent = 5; | 1654 video_media_info.senders[0].packets_sent = 5; |
1653 video_media_info.senders[0].bytes_sent = 6; | 1655 video_media_info.senders[0].bytes_sent = 6; |
1654 video_media_info.senders[0].rtt_ms = 7500; | 1656 video_media_info.senders[0].rtt_ms = 7500; |
1655 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); | 1657 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); |
| 1658 video_media_info.senders[0].frames_encoded = 8; |
| 1659 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(16); |
1656 | 1660 |
1657 RtpCodecParameters codec_parameters; | 1661 RtpCodecParameters codec_parameters; |
1658 codec_parameters.payload_type = 42; | 1662 codec_parameters.payload_type = 42; |
1659 codec_parameters.mime_type = "dummy"; | 1663 codec_parameters.mime_type = "dummy"; |
1660 codec_parameters.clock_rate = 0; | 1664 codec_parameters.clock_rate = 0; |
1661 video_media_info.send_codecs.insert( | 1665 video_media_info.send_codecs.insert( |
1662 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1666 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1663 | 1667 |
1664 EXPECT_CALL(*video_media_channel, GetStats(_)) | 1668 EXPECT_CALL(*video_media_channel, GetStats(_)) |
1665 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 1669 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
(...skipping 25 matching lines...) Expand all Loading... |
1691 expected_video.media_type = "video"; | 1695 expected_video.media_type = "video"; |
1692 expected_video.transport_id = "RTCTransport_TransportName_" + | 1696 expected_video.transport_id = "RTCTransport_TransportName_" + |
1693 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1697 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1694 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; | 1698 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; |
1695 expected_video.fir_count = 2; | 1699 expected_video.fir_count = 2; |
1696 expected_video.pli_count = 3; | 1700 expected_video.pli_count = 3; |
1697 expected_video.nack_count = 4; | 1701 expected_video.nack_count = 4; |
1698 expected_video.packets_sent = 5; | 1702 expected_video.packets_sent = 5; |
1699 expected_video.bytes_sent = 6; | 1703 expected_video.bytes_sent = 6; |
1700 expected_video.round_trip_time = 7.5; | 1704 expected_video.round_trip_time = 7.5; |
| 1705 expected_video.frames_encoded = 8; |
| 1706 expected_video.qp_sum = 16; |
1701 | 1707 |
1702 ASSERT(report->Get(expected_video.id())); | 1708 ASSERT(report->Get(expected_video.id())); |
1703 const RTCOutboundRTPStreamStats& video = report->Get( | 1709 const RTCOutboundRTPStreamStats& video = report->Get( |
1704 expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(); | 1710 expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(); |
1705 EXPECT_EQ(video, expected_video); | 1711 EXPECT_EQ(video, expected_video); |
1706 | 1712 |
1707 ASSERT_TRUE(report->Get(*expected_video.transport_id)); | 1713 ASSERT_TRUE(report->Get(*expected_video.transport_id)); |
1708 ASSERT_TRUE(report->Get(*expected_video.codec_id)); | 1714 ASSERT_TRUE(report->Get(*expected_video.codec_id)); |
1709 } | 1715 } |
1710 | 1716 |
(...skipping 21 matching lines...) Expand all Loading... |
1732 video_media_info.senders.push_back(cricket::VideoSenderInfo()); | 1738 video_media_info.senders.push_back(cricket::VideoSenderInfo()); |
1733 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); | 1739 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); |
1734 video_media_info.senders[0].local_stats[0].ssrc = 1; | 1740 video_media_info.senders[0].local_stats[0].ssrc = 1; |
1735 video_media_info.senders[0].firs_rcvd = 2; | 1741 video_media_info.senders[0].firs_rcvd = 2; |
1736 video_media_info.senders[0].plis_rcvd = 3; | 1742 video_media_info.senders[0].plis_rcvd = 3; |
1737 video_media_info.senders[0].nacks_rcvd = 4; | 1743 video_media_info.senders[0].nacks_rcvd = 4; |
1738 video_media_info.senders[0].packets_sent = 5; | 1744 video_media_info.senders[0].packets_sent = 5; |
1739 video_media_info.senders[0].bytes_sent = 6; | 1745 video_media_info.senders[0].bytes_sent = 6; |
1740 video_media_info.senders[0].rtt_ms = -1; | 1746 video_media_info.senders[0].rtt_ms = -1; |
1741 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); | 1747 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); |
| 1748 video_media_info.senders[0].frames_encoded = 7; |
1742 | 1749 |
1743 EXPECT_CALL(*voice_media_channel, GetStats(_)) | 1750 EXPECT_CALL(*voice_media_channel, GetStats(_)) |
1744 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); | 1751 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); |
1745 EXPECT_CALL(*video_media_channel, GetStats(_)) | 1752 EXPECT_CALL(*video_media_channel, GetStats(_)) |
1746 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 1753 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
1747 | 1754 |
1748 SessionStats session_stats; | 1755 SessionStats session_stats; |
1749 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; | 1756 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; |
1750 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; | 1757 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; |
1751 session_stats.transport_stats["TransportName"].transport_name = | 1758 session_stats.transport_stats["TransportName"].transport_name = |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1791 expected_video.is_remote = false; | 1798 expected_video.is_remote = false; |
1792 expected_video.media_type = "video"; | 1799 expected_video.media_type = "video"; |
1793 expected_video.transport_id = "RTCTransport_TransportName_" + | 1800 expected_video.transport_id = "RTCTransport_TransportName_" + |
1794 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1801 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1795 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; | 1802 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; |
1796 expected_video.fir_count = 2; | 1803 expected_video.fir_count = 2; |
1797 expected_video.pli_count = 3; | 1804 expected_video.pli_count = 3; |
1798 expected_video.nack_count = 4; | 1805 expected_video.nack_count = 4; |
1799 expected_video.packets_sent = 5; | 1806 expected_video.packets_sent = 5; |
1800 expected_video.bytes_sent = 6; | 1807 expected_video.bytes_sent = 6; |
| 1808 expected_video.frames_encoded = 7; |
1801 // |expected_video.round_trip_time| should be undefined. | 1809 // |expected_video.round_trip_time| should be undefined. |
| 1810 // |expected_video.qp_sum| should be undefined. |
1802 | 1811 |
1803 ASSERT(report->Get(expected_video.id())); | 1812 ASSERT(report->Get(expected_video.id())); |
1804 const RTCOutboundRTPStreamStats& video = report->Get( | 1813 const RTCOutboundRTPStreamStats& video = report->Get( |
1805 expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(); | 1814 expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(); |
1806 EXPECT_EQ(video, expected_video); | 1815 EXPECT_EQ(video, expected_video); |
1807 } | 1816 } |
1808 | 1817 |
1809 TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) { | 1818 TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) { |
1810 std::unique_ptr<cricket::Candidate> rtp_local_candidate = CreateFakeCandidate( | 1819 std::unique_ptr<cricket::Candidate> rtp_local_candidate = CreateFakeCandidate( |
1811 "42.42.42.42", 42, "protocol", cricket::LOCAL_PORT_TYPE, 42); | 1820 "42.42.42.42", 42, "protocol", cricket::LOCAL_PORT_TYPE, 42); |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1976 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; | 1985 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; |
1977 }; | 1986 }; |
1978 | 1987 |
1979 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { | 1988 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { |
1980 collector_->VerifyThreadUsageAndResultsMerging(); | 1989 collector_->VerifyThreadUsageAndResultsMerging(); |
1981 } | 1990 } |
1982 | 1991 |
1983 } // namespace | 1992 } // namespace |
1984 | 1993 |
1985 } // namespace webrtc | 1994 } // namespace webrtc |
OLD | NEW |