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 1920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1931 test_->SetupLocalTrackAndSender( | 1931 test_->SetupLocalTrackAndSender( |
1932 cricket::MEDIA_TYPE_AUDIO, "LocalAudioTrackID", 1); | 1932 cricket::MEDIA_TYPE_AUDIO, "LocalAudioTrackID", 1); |
1933 | 1933 |
1934 cricket::VoiceMediaInfo voice_media_info; | 1934 cricket::VoiceMediaInfo voice_media_info; |
1935 | 1935 |
1936 voice_media_info.senders.push_back(cricket::VoiceSenderInfo()); | 1936 voice_media_info.senders.push_back(cricket::VoiceSenderInfo()); |
1937 voice_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); | 1937 voice_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); |
1938 voice_media_info.senders[0].local_stats[0].ssrc = 1; | 1938 voice_media_info.senders[0].local_stats[0].ssrc = 1; |
1939 voice_media_info.senders[0].packets_sent = 2; | 1939 voice_media_info.senders[0].packets_sent = 2; |
1940 voice_media_info.senders[0].bytes_sent = 3; | 1940 voice_media_info.senders[0].bytes_sent = 3; |
1941 voice_media_info.senders[0].rtt_ms = -1; | |
1942 voice_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); | 1941 voice_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); |
1943 | 1942 |
1944 RtpCodecParameters codec_parameters; | 1943 RtpCodecParameters codec_parameters; |
1945 codec_parameters.payload_type = 42; | 1944 codec_parameters.payload_type = 42; |
1946 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; | 1945 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; |
1947 codec_parameters.name = "dummy"; | 1946 codec_parameters.name = "dummy"; |
1948 codec_parameters.clock_rate = rtc::Optional<int>(0); | 1947 codec_parameters.clock_rate = rtc::Optional<int>(0); |
1949 voice_media_info.send_codecs.insert( | 1948 voice_media_info.send_codecs.insert( |
1950 std::make_pair(codec_parameters.payload_type, codec_parameters)); | 1949 std::make_pair(codec_parameters.payload_type, codec_parameters)); |
1951 | 1950 |
(...skipping 25 matching lines...) Expand all Loading... |
1977 expected_audio.ssrc = 1; | 1976 expected_audio.ssrc = 1; |
1978 expected_audio.is_remote = false; | 1977 expected_audio.is_remote = false; |
1979 expected_audio.media_type = "audio"; | 1978 expected_audio.media_type = "audio"; |
1980 expected_audio.track_id = | 1979 expected_audio.track_id = |
1981 "RTCMediaStreamTrack_local_audio_LocalAudioTrackID_1"; | 1980 "RTCMediaStreamTrack_local_audio_LocalAudioTrackID_1"; |
1982 expected_audio.transport_id = "RTCTransport_TransportName_" + | 1981 expected_audio.transport_id = "RTCTransport_TransportName_" + |
1983 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); | 1982 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); |
1984 expected_audio.codec_id = "RTCCodec_OutboundAudio_42"; | 1983 expected_audio.codec_id = "RTCCodec_OutboundAudio_42"; |
1985 expected_audio.packets_sent = 2; | 1984 expected_audio.packets_sent = 2; |
1986 expected_audio.bytes_sent = 3; | 1985 expected_audio.bytes_sent = 3; |
1987 // |expected_audio.round_trip_time| should be undefined. | |
1988 | 1986 |
1989 ASSERT_TRUE(report->Get(expected_audio.id())); | 1987 ASSERT_TRUE(report->Get(expected_audio.id())); |
1990 EXPECT_EQ( | 1988 EXPECT_EQ( |
1991 report->Get(expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>(), | 1989 report->Get(expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>(), |
1992 expected_audio); | 1990 expected_audio); |
1993 | 1991 |
1994 // Set previously undefined values and "GetStats" again. | |
1995 voice_media_info.senders[0].rtt_ms = 4500; | |
1996 expected_audio.round_trip_time = 4.5; | |
1997 | |
1998 EXPECT_CALL(*voice_media_channel, GetStats(_)) | |
1999 .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true))); | |
2000 collector_->ClearCachedStatsReport(); | |
2001 report = GetStatsReport(); | |
2002 | |
2003 ASSERT_TRUE(report->Get(expected_audio.id())); | 1992 ASSERT_TRUE(report->Get(expected_audio.id())); |
2004 EXPECT_EQ( | 1993 EXPECT_EQ( |
2005 report->Get(expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>(), | 1994 report->Get(expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>(), |
2006 expected_audio); | 1995 expected_audio); |
2007 EXPECT_TRUE(report->Get(*expected_audio.track_id)); | 1996 EXPECT_TRUE(report->Get(*expected_audio.track_id)); |
2008 EXPECT_TRUE(report->Get(*expected_audio.transport_id)); | 1997 EXPECT_TRUE(report->Get(*expected_audio.transport_id)); |
2009 EXPECT_TRUE(report->Get(*expected_audio.codec_id)); | 1998 EXPECT_TRUE(report->Get(*expected_audio.codec_id)); |
2010 } | 1999 } |
2011 | 2000 |
2012 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) { | 2001 TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) { |
2013 MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel(); | 2002 MockVideoMediaChannel* video_media_channel = new MockVideoMediaChannel(); |
2014 cricket::VideoChannel video_channel( | 2003 cricket::VideoChannel video_channel( |
2015 test_->worker_thread(), test_->network_thread(), | 2004 test_->worker_thread(), test_->network_thread(), |
2016 test_->signaling_thread(), video_media_channel, "VideoContentName", | 2005 test_->signaling_thread(), video_media_channel, "VideoContentName", |
2017 kDefaultRtcpMuxRequired, kDefaultSrtpRequired); | 2006 kDefaultRtcpMuxRequired, kDefaultSrtpRequired); |
2018 | 2007 |
2019 test_->SetupLocalTrackAndSender( | 2008 test_->SetupLocalTrackAndSender( |
2020 cricket::MEDIA_TYPE_VIDEO, "LocalVideoTrackID", 1); | 2009 cricket::MEDIA_TYPE_VIDEO, "LocalVideoTrackID", 1); |
2021 | 2010 |
2022 cricket::VideoMediaInfo video_media_info; | 2011 cricket::VideoMediaInfo video_media_info; |
2023 | 2012 |
2024 video_media_info.senders.push_back(cricket::VideoSenderInfo()); | 2013 video_media_info.senders.push_back(cricket::VideoSenderInfo()); |
2025 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); | 2014 video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo()); |
2026 video_media_info.senders[0].local_stats[0].ssrc = 1; | 2015 video_media_info.senders[0].local_stats[0].ssrc = 1; |
2027 video_media_info.senders[0].firs_rcvd = 2; | 2016 video_media_info.senders[0].firs_rcvd = 2; |
2028 video_media_info.senders[0].plis_rcvd = 3; | 2017 video_media_info.senders[0].plis_rcvd = 3; |
2029 video_media_info.senders[0].nacks_rcvd = 4; | 2018 video_media_info.senders[0].nacks_rcvd = 4; |
2030 video_media_info.senders[0].packets_sent = 5; | 2019 video_media_info.senders[0].packets_sent = 5; |
2031 video_media_info.senders[0].bytes_sent = 6; | 2020 video_media_info.senders[0].bytes_sent = 6; |
2032 video_media_info.senders[0].rtt_ms = -1; | |
2033 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); | 2021 video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42); |
2034 video_media_info.senders[0].frames_encoded = 8; | 2022 video_media_info.senders[0].frames_encoded = 8; |
2035 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(); | 2023 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(); |
2036 | 2024 |
2037 RtpCodecParameters codec_parameters; | 2025 RtpCodecParameters codec_parameters; |
2038 codec_parameters.payload_type = 42; | 2026 codec_parameters.payload_type = 42; |
2039 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; | 2027 codec_parameters.kind = cricket::MEDIA_TYPE_AUDIO; |
2040 codec_parameters.name = "dummy"; | 2028 codec_parameters.name = "dummy"; |
2041 codec_parameters.clock_rate = rtc::Optional<int>(0); | 2029 codec_parameters.clock_rate = rtc::Optional<int>(0); |
2042 video_media_info.send_codecs.insert( | 2030 video_media_info.send_codecs.insert( |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2074 "RTCMediaStreamTrack_local_video_LocalVideoTrackID_1"; | 2062 "RTCMediaStreamTrack_local_video_LocalVideoTrackID_1"; |
2075 expected_video.transport_id = "RTCTransport_TransportName_" + | 2063 expected_video.transport_id = "RTCTransport_TransportName_" + |
2076 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); | 2064 rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP); |
2077 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; | 2065 expected_video.codec_id = "RTCCodec_OutboundVideo_42"; |
2078 expected_video.fir_count = 2; | 2066 expected_video.fir_count = 2; |
2079 expected_video.pli_count = 3; | 2067 expected_video.pli_count = 3; |
2080 expected_video.nack_count = 4; | 2068 expected_video.nack_count = 4; |
2081 expected_video.packets_sent = 5; | 2069 expected_video.packets_sent = 5; |
2082 expected_video.bytes_sent = 6; | 2070 expected_video.bytes_sent = 6; |
2083 expected_video.frames_encoded = 8; | 2071 expected_video.frames_encoded = 8; |
2084 // |expected_video.round_trip_time| and |expected_video.qp_sum| should be | 2072 // |expected_video.qp_sum| should be undefined. |
2085 // undefined. | |
2086 | 2073 |
2087 ASSERT_TRUE(report->Get(expected_video.id())); | 2074 ASSERT_TRUE(report->Get(expected_video.id())); |
2088 EXPECT_EQ( | 2075 EXPECT_EQ( |
2089 report->Get(expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(), | 2076 report->Get(expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(), |
2090 expected_video); | 2077 expected_video); |
2091 | 2078 |
2092 // Set previously undefined values and "GetStats" again. | 2079 // Set previously undefined values and "GetStats" again. |
2093 video_media_info.senders[0].rtt_ms = 7500; | |
2094 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(9); | 2080 video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(9); |
2095 expected_video.round_trip_time = 7.5; | |
2096 expected_video.qp_sum = 9; | 2081 expected_video.qp_sum = 9; |
2097 | 2082 |
2098 EXPECT_CALL(*video_media_channel, GetStats(_)) | 2083 EXPECT_CALL(*video_media_channel, GetStats(_)) |
2099 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); | 2084 .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true))); |
2100 collector_->ClearCachedStatsReport(); | 2085 collector_->ClearCachedStatsReport(); |
2101 report = GetStatsReport(); | 2086 report = GetStatsReport(); |
2102 | 2087 |
2103 ASSERT_TRUE(report->Get(expected_video.id())); | 2088 ASSERT_TRUE(report->Get(expected_video.id())); |
2104 EXPECT_EQ( | 2089 EXPECT_EQ( |
2105 report->Get(expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(), | 2090 report->Get(expected_video.id())->cast_to<RTCOutboundRTPStreamStats>(), |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2280 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; | 2265 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; |
2281 }; | 2266 }; |
2282 | 2267 |
2283 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { | 2268 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { |
2284 collector_->VerifyThreadUsageAndResultsMerging(); | 2269 collector_->VerifyThreadUsageAndResultsMerging(); |
2285 } | 2270 } |
2286 | 2271 |
2287 } // namespace | 2272 } // namespace |
2288 | 2273 |
2289 } // namespace webrtc | 2274 } // namespace webrtc |
OLD | NEW |