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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
758 cricket::VideoChannel video_channel( | 758 cricket::VideoChannel video_channel( |
759 test_->worker_thread(), test_->network_thread(), | 759 test_->worker_thread(), test_->network_thread(), |
760 test_->signaling_thread(), video_media_channel, "VideoContentName", | 760 test_->signaling_thread(), video_media_channel, "VideoContentName", |
761 kDefaultRtcpMuxRequired, kDefaultSrtpRequired); | 761 kDefaultRtcpMuxRequired, kDefaultSrtpRequired); |
762 | 762 |
763 // Audio | 763 // Audio |
764 cricket::VoiceMediaInfo voice_media_info; | 764 cricket::VoiceMediaInfo voice_media_info; |
765 | 765 |
766 RtpCodecParameters inbound_audio_codec; | 766 RtpCodecParameters inbound_audio_codec; |
767 inbound_audio_codec.payload_type = 1; | 767 inbound_audio_codec.payload_type = 1; |
768 inbound_audio_codec.mime_type = "opus"; | 768 inbound_audio_codec.kind = cricket::MEDIA_TYPE_AUDIO; |
769 inbound_audio_codec.clock_rate = 1337; | 769 inbound_audio_codec.name = "opus"; |
| 770 inbound_audio_codec.clock_rate = rtc::Optional<int>(1337); |
770 voice_media_info.receive_codecs.insert( | 771 voice_media_info.receive_codecs.insert( |
771 std::make_pair(inbound_audio_codec.payload_type, inbound_audio_codec)); | 772 std::make_pair(inbound_audio_codec.payload_type, inbound_audio_codec)); |
772 | 773 |
773 RtpCodecParameters outbound_audio_codec; | 774 RtpCodecParameters outbound_audio_codec; |
774 outbound_audio_codec.payload_type = 2; | 775 outbound_audio_codec.payload_type = 2; |
775 outbound_audio_codec.mime_type = "isac"; | 776 outbound_audio_codec.kind = cricket::MEDIA_TYPE_AUDIO; |
776 outbound_audio_codec.clock_rate = 1338; | 777 outbound_audio_codec.name = "isac"; |
| 778 outbound_audio_codec.clock_rate = rtc::Optional<int>(1338); |
777 voice_media_info.send_codecs.insert( | 779 voice_media_info.send_codecs.insert( |
778 std::make_pair(outbound_audio_codec.payload_type, outbound_audio_codec)); | 780 std::make_pair(outbound_audio_codec.payload_type, outbound_audio_codec)); |
779 | 781 |
780 EXPECT_CALL(*voice_media_channel, GetStats(_)) | 782 EXPECT_CALL(*voice_media_channel, GetStats(_)) |
781 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); | 783 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); |
782 | 784 |
783 // Video | 785 // Video |
784 cricket::VideoMediaInfo video_media_info; | 786 cricket::VideoMediaInfo video_media_info; |
785 | 787 |
786 RtpCodecParameters inbound_video_codec; | 788 RtpCodecParameters inbound_video_codec; |
787 inbound_video_codec.payload_type = 3; | 789 inbound_video_codec.payload_type = 3; |
788 inbound_video_codec.mime_type = "H264"; | 790 inbound_video_codec.kind = cricket::MEDIA_TYPE_VIDEO; |
789 inbound_video_codec.clock_rate = 1339; | 791 inbound_video_codec.name = "H264"; |
| 792 inbound_video_codec.clock_rate = rtc::Optional<int>(1339); |
790 video_media_info.receive_codecs.insert( | 793 video_media_info.receive_codecs.insert( |
791 std::make_pair(inbound_video_codec.payload_type, inbound_video_codec)); | 794 std::make_pair(inbound_video_codec.payload_type, inbound_video_codec)); |
792 | 795 |
793 RtpCodecParameters outbound_video_codec; | 796 RtpCodecParameters outbound_video_codec; |
794 outbound_video_codec.payload_type = 4; | 797 outbound_video_codec.payload_type = 4; |
795 outbound_video_codec.mime_type = "VP8"; | 798 outbound_video_codec.kind = cricket::MEDIA_TYPE_VIDEO; |
796 outbound_video_codec.clock_rate = 1340; | 799 outbound_video_codec.name = "VP8"; |
| 800 outbound_video_codec.clock_rate = rtc::Optional<int>(1340); |
797 video_media_info.send_codecs.insert( | 801 video_media_info.send_codecs.insert( |
798 std::make_pair(outbound_video_codec.payload_type, outbound_video_codec)); | 802 std::make_pair(outbound_video_codec.payload_type, outbound_video_codec)); |
799 | 803 |
800 EXPECT_CALL(*video_media_channel, GetStats(_)) | 804 EXPECT_CALL(*video_media_channel, GetStats(_)) |
801 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 805 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
802 | 806 |
803 SessionStats session_stats; | 807 SessionStats session_stats; |
804 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; | 808 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; |
805 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; | 809 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; |
806 session_stats.transport_stats["TransportName"].transport_name = | 810 session_stats.transport_stats["TransportName"].transport_name = |
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1680 voice_media_info.receivers[0].local_stats[0].ssrc = 1; | 1684 voice_media_info.receivers[0].local_stats[0].ssrc = 1; |
1681 voice_media_info.receivers[0].packets_lost = 42; | 1685 voice_media_info.receivers[0].packets_lost = 42; |
1682 voice_media_info.receivers[0].packets_rcvd = 2; | 1686 voice_media_info.receivers[0].packets_rcvd = 2; |
1683 voice_media_info.receivers[0].bytes_rcvd = 3; | 1687 voice_media_info.receivers[0].bytes_rcvd = 3; |
1684 voice_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); | 1688 voice_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); |
1685 voice_media_info.receivers[0].jitter_ms = 4500; | 1689 voice_media_info.receivers[0].jitter_ms = 4500; |
1686 voice_media_info.receivers[0].fraction_lost = 5.5f; | 1690 voice_media_info.receivers[0].fraction_lost = 5.5f; |
1687 | 1691 |
1688 RtpCodecParameters codec_parameters; | 1692 RtpCodecParameters codec_parameters; |
1689 codec_parameters.payload_type = 42; | 1693 codec_parameters.payload_type = 42; |
1690 codec_parameters.mime_type = "dummy"; | 1694 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; |
1691 codec_parameters.clock_rate = 0; | 1695 codec_parameters.name = "dummy"; |
| 1696 codec_parameters.clock_rate = rtc::Optional<int>(0); |
1692 voice_media_info.receive_codecs.insert( | 1697 voice_media_info.receive_codecs.insert( |
1693 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1698 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1694 | 1699 |
1695 EXPECT_CALL(*voice_media_channel, GetStats(_)) | 1700 EXPECT_CALL(*voice_media_channel, GetStats(_)) |
1696 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); | 1701 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); |
1697 | 1702 |
1698 SessionStats session_stats; | 1703 SessionStats session_stats; |
1699 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; | 1704 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; |
1700 session_stats.transport_stats["TransportName"].transport_name = | 1705 session_stats.transport_stats["TransportName"].transport_name = |
1701 "TransportName"; | 1706 "TransportName"; |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1762 video_media_info.receivers[0].bytes_rcvd = 3; | 1767 video_media_info.receivers[0].bytes_rcvd = 3; |
1763 video_media_info.receivers[0].fraction_lost = 4.5f; | 1768 video_media_info.receivers[0].fraction_lost = 4.5f; |
1764 video_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); | 1769 video_media_info.receivers[0].codec_payload_type = rtc::Optional<int>(42); |
1765 video_media_info.receivers[0].firs_sent = 5; | 1770 video_media_info.receivers[0].firs_sent = 5; |
1766 video_media_info.receivers[0].plis_sent = 6; | 1771 video_media_info.receivers[0].plis_sent = 6; |
1767 video_media_info.receivers[0].nacks_sent = 7; | 1772 video_media_info.receivers[0].nacks_sent = 7; |
1768 video_media_info.receivers[0].frames_decoded = 8; | 1773 video_media_info.receivers[0].frames_decoded = 8; |
1769 | 1774 |
1770 RtpCodecParameters codec_parameters; | 1775 RtpCodecParameters codec_parameters; |
1771 codec_parameters.payload_type = 42; | 1776 codec_parameters.payload_type = 42; |
1772 codec_parameters.mime_type = "dummy"; | 1777 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; |
1773 codec_parameters.clock_rate = 0; | 1778 codec_parameters.name = "dummy"; |
| 1779 codec_parameters.clock_rate = rtc::Optional<int>(0); |
1774 video_media_info.receive_codecs.insert( | 1780 video_media_info.receive_codecs.insert( |
1775 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1781 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1776 | 1782 |
1777 EXPECT_CALL(*video_media_channel, GetStats(_)) | 1783 EXPECT_CALL(*video_media_channel, GetStats(_)) |
1778 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 1784 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
1779 | 1785 |
1780 SessionStats session_stats; | 1786 SessionStats session_stats; |
1781 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; | 1787 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; |
1782 session_stats.transport_stats["TransportName"].transport_name = | 1788 session_stats.transport_stats["TransportName"].transport_name = |
1783 "TransportName"; | 1789 "TransportName"; |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1841 voice_media_info.senders.push_back(cricket::VoiceSenderInfo()); | 1847 voice_media_info.senders.push_back(cricket::VoiceSenderInfo()); |
1842 voice_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); | 1848 voice_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); |
1843 voice_media_info.senders[0].local_stats[0].ssrc = 1; | 1849 voice_media_info.senders[0].local_stats[0].ssrc = 1; |
1844 voice_media_info.senders[0].packets_sent = 2; | 1850 voice_media_info.senders[0].packets_sent = 2; |
1845 voice_media_info.senders[0].bytes_sent = 3; | 1851 voice_media_info.senders[0].bytes_sent = 3; |
1846 voice_media_info.senders[0].rtt_ms = 4500; | 1852 voice_media_info.senders[0].rtt_ms = 4500; |
1847 voice_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); | 1853 voice_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); |
1848 | 1854 |
1849 RtpCodecParameters codec_parameters; | 1855 RtpCodecParameters codec_parameters; |
1850 codec_parameters.payload_type = 42; | 1856 codec_parameters.payload_type = 42; |
1851 codec_parameters.mime_type = "dummy"; | 1857 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; |
1852 codec_parameters.clock_rate = 0; | 1858 codec_parameters.name = "dummy"; |
| 1859 codec_parameters.clock_rate = rtc::Optional<int>(0); |
1853 voice_media_info.send_codecs.insert( | 1860 voice_media_info.send_codecs.insert( |
1854 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1861 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1855 | 1862 |
1856 EXPECT_CALL(*voice_media_channel, GetStats(_)) | 1863 EXPECT_CALL(*voice_media_channel, GetStats(_)) |
1857 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); | 1864 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); |
1858 | 1865 |
1859 SessionStats session_stats; | 1866 SessionStats session_stats; |
1860 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; | 1867 session_stats.proxy_to_transport["VoiceContentName"] = "TransportName"; |
1861 session_stats.transport_stats["TransportName"].transport_name = | 1868 session_stats.transport_stats["TransportName"].transport_name = |
1862 "TransportName"; | 1869 "TransportName"; |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1920 video_media_info.senders[0].nacks_rcvd = 4; | 1927 video_media_info.senders[0].nacks_rcvd = 4; |
1921 video_media_info.senders[0].packets_sent = 5; | 1928 video_media_info.senders[0].packets_sent = 5; |
1922 video_media_info.senders[0].bytes_sent = 6; | 1929 video_media_info.senders[0].bytes_sent = 6; |
1923 video_media_info.senders[0].rtt_ms = 7500; | 1930 video_media_info.senders[0].rtt_ms = 7500; |
1924 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); | 1931 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); |
1925 video_media_info.senders[0].frames_encoded = 8; | 1932 video_media_info.senders[0].frames_encoded = 8; |
1926 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(16); | 1933 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(16); |
1927 | 1934 |
1928 RtpCodecParameters codec_parameters; | 1935 RtpCodecParameters codec_parameters; |
1929 codec_parameters.payload_type = 42; | 1936 codec_parameters.payload_type = 42; |
1930 codec_parameters.mime_type = "dummy"; | 1937 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; |
1931 codec_parameters.clock_rate = 0; | 1938 codec_parameters.name = "dummy"; |
| 1939 codec_parameters.clock_rate = rtc::Optional<int>(0); |
1932 video_media_info.send_codecs.insert( | 1940 video_media_info.send_codecs.insert( |
1933 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1941 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1934 | 1942 |
1935 EXPECT_CALL(*video_media_channel, GetStats(_)) | 1943 EXPECT_CALL(*video_media_channel, GetStats(_)) |
1936 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 1944 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
1937 | 1945 |
1938 SessionStats session_stats; | 1946 SessionStats session_stats; |
1939 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; | 1947 session_stats.proxy_to_transport["VideoContentName"] = "TransportName"; |
1940 session_stats.transport_stats["TransportName"].transport_name = | 1948 session_stats.transport_stats["TransportName"].transport_name = |
1941 "TransportName"; | 1949 "TransportName"; |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2257 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; | 2265 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; |
2258 }; | 2266 }; |
2259 | 2267 |
2260 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { | 2268 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { |
2261 collector_->VerifyThreadUsageAndResultsMerging(); | 2269 collector_->VerifyThreadUsageAndResultsMerging(); |
2262 } | 2270 } |
2263 | 2271 |
2264 } // namespace | 2272 } // namespace |
2265 | 2273 |
2266 } // namespace webrtc | 2274 } // namespace webrtc |
OLD | NEW |