| 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 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1533 CreateFakeTrack(cricket::MEDIA_TYPE_VIDEO, "RemoteVideoTrackID3", | 1533 CreateFakeTrack(cricket::MEDIA_TYPE_VIDEO, "RemoteVideoTrackID3", |
| 1534 MediaStreamTrackInterface::kEnded); | 1534 MediaStreamTrackInterface::kEnded); |
| 1535 remote_stream->AddTrack(static_cast<VideoTrackInterface*>( | 1535 remote_stream->AddTrack(static_cast<VideoTrackInterface*>( |
| 1536 remote_video_track_ssrc3.get())); | 1536 remote_video_track_ssrc3.get())); |
| 1537 | 1537 |
| 1538 cricket::VideoReceiverInfo video_receiver_info_ssrc3; | 1538 cricket::VideoReceiverInfo video_receiver_info_ssrc3; |
| 1539 video_receiver_info_ssrc3.local_stats.push_back(cricket::SsrcReceiverInfo()); | 1539 video_receiver_info_ssrc3.local_stats.push_back(cricket::SsrcReceiverInfo()); |
| 1540 video_receiver_info_ssrc3.local_stats[0].ssrc = 3; | 1540 video_receiver_info_ssrc3.local_stats[0].ssrc = 3; |
| 1541 video_receiver_info_ssrc3.frame_width = 6789; | 1541 video_receiver_info_ssrc3.frame_width = 6789; |
| 1542 video_receiver_info_ssrc3.frame_height = 9876; | 1542 video_receiver_info_ssrc3.frame_height = 9876; |
| 1543 video_receiver_info_ssrc3.frames_received = 2468; |
| 1543 | 1544 |
| 1544 // Remote video track with undefined (default) values | 1545 // Remote video track with undefined (default) values |
| 1545 rtc::scoped_refptr<MediaStreamTrackInterface> remote_video_track_ssrc4 = | 1546 rtc::scoped_refptr<MediaStreamTrackInterface> remote_video_track_ssrc4 = |
| 1546 CreateFakeTrack(cricket::MEDIA_TYPE_VIDEO, "RemoteVideoTrackID4", | 1547 CreateFakeTrack(cricket::MEDIA_TYPE_VIDEO, "RemoteVideoTrackID4", |
| 1547 MediaStreamTrackInterface::kLive); | 1548 MediaStreamTrackInterface::kLive); |
| 1548 remote_stream->AddTrack(static_cast<VideoTrackInterface*>( | 1549 remote_stream->AddTrack(static_cast<VideoTrackInterface*>( |
| 1549 remote_video_track_ssrc4.get())); | 1550 remote_video_track_ssrc4.get())); |
| 1550 | 1551 |
| 1551 cricket::VideoReceiverInfo video_receiver_info_ssrc4; | 1552 cricket::VideoReceiverInfo video_receiver_info_ssrc4; |
| 1552 video_receiver_info_ssrc4.local_stats.push_back(cricket::SsrcReceiverInfo()); | 1553 video_receiver_info_ssrc4.local_stats.push_back(cricket::SsrcReceiverInfo()); |
| 1553 video_receiver_info_ssrc4.local_stats[0].ssrc = 4; | 1554 video_receiver_info_ssrc4.local_stats[0].ssrc = 4; |
| 1554 video_receiver_info_ssrc4.frame_width = 0; | 1555 video_receiver_info_ssrc4.frame_width = 0; |
| 1555 video_receiver_info_ssrc4.frame_height = 0; | 1556 video_receiver_info_ssrc4.frame_height = 0; |
| 1557 video_receiver_info_ssrc4.frames_received = 0; |
| 1556 | 1558 |
| 1557 test_->CreateMockRtpSendersReceiversAndChannels( | 1559 test_->CreateMockRtpSendersReceiversAndChannels( |
| 1558 {}, {}, | 1560 {}, {}, |
| 1559 { std::make_pair(local_video_track.get(), video_sender_info_ssrc1), | 1561 { std::make_pair(local_video_track.get(), video_sender_info_ssrc1), |
| 1560 std::make_pair(local_video_track.get(), video_sender_info_ssrc2) }, | 1562 std::make_pair(local_video_track.get(), video_sender_info_ssrc2) }, |
| 1561 { std::make_pair(remote_video_track_ssrc3.get(), | 1563 { std::make_pair(remote_video_track_ssrc3.get(), |
| 1562 video_receiver_info_ssrc3), | 1564 video_receiver_info_ssrc3), |
| 1563 std::make_pair(remote_video_track_ssrc4.get(), | 1565 std::make_pair(remote_video_track_ssrc4.get(), |
| 1564 video_receiver_info_ssrc4) }); | 1566 video_receiver_info_ssrc4) }); |
| 1565 | 1567 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1618 RTCMediaStreamTrackStats expected_remote_video_track_ssrc3( | 1620 RTCMediaStreamTrackStats expected_remote_video_track_ssrc3( |
| 1619 "RTCMediaStreamTrack_remote_video_RemoteVideoTrackID3_3", | 1621 "RTCMediaStreamTrack_remote_video_RemoteVideoTrackID3_3", |
| 1620 report->timestamp_us(), RTCMediaStreamTrackKind::kVideo); | 1622 report->timestamp_us(), RTCMediaStreamTrackKind::kVideo); |
| 1621 expected_remote_video_track_ssrc3.track_identifier = | 1623 expected_remote_video_track_ssrc3.track_identifier = |
| 1622 remote_video_track_ssrc3->id(); | 1624 remote_video_track_ssrc3->id(); |
| 1623 expected_remote_video_track_ssrc3.remote_source = true; | 1625 expected_remote_video_track_ssrc3.remote_source = true; |
| 1624 expected_remote_video_track_ssrc3.ended = true; | 1626 expected_remote_video_track_ssrc3.ended = true; |
| 1625 expected_remote_video_track_ssrc3.detached = false; | 1627 expected_remote_video_track_ssrc3.detached = false; |
| 1626 expected_remote_video_track_ssrc3.frame_width = 6789; | 1628 expected_remote_video_track_ssrc3.frame_width = 6789; |
| 1627 expected_remote_video_track_ssrc3.frame_height = 9876; | 1629 expected_remote_video_track_ssrc3.frame_height = 9876; |
| 1630 expected_remote_video_track_ssrc3.frames_received = 2468; |
| 1628 ASSERT_TRUE(report->Get(expected_remote_video_track_ssrc3.id())); | 1631 ASSERT_TRUE(report->Get(expected_remote_video_track_ssrc3.id())); |
| 1629 EXPECT_EQ(expected_remote_video_track_ssrc3, | 1632 EXPECT_EQ(expected_remote_video_track_ssrc3, |
| 1630 report->Get(expected_remote_video_track_ssrc3.id())->cast_to< | 1633 report->Get(expected_remote_video_track_ssrc3.id())->cast_to< |
| 1631 RTCMediaStreamTrackStats>()); | 1634 RTCMediaStreamTrackStats>()); |
| 1632 | 1635 |
| 1633 RTCMediaStreamTrackStats expected_remote_video_track_ssrc4( | 1636 RTCMediaStreamTrackStats expected_remote_video_track_ssrc4( |
| 1634 "RTCMediaStreamTrack_remote_video_RemoteVideoTrackID4_4", | 1637 "RTCMediaStreamTrack_remote_video_RemoteVideoTrackID4_4", |
| 1635 report->timestamp_us(), RTCMediaStreamTrackKind::kVideo); | 1638 report->timestamp_us(), RTCMediaStreamTrackKind::kVideo); |
| 1636 expected_remote_video_track_ssrc4.track_identifier = | 1639 expected_remote_video_track_ssrc4.track_identifier = |
| 1637 remote_video_track_ssrc4->id(); | 1640 remote_video_track_ssrc4->id(); |
| 1638 expected_remote_video_track_ssrc4.remote_source = true; | 1641 expected_remote_video_track_ssrc4.remote_source = true; |
| 1639 expected_remote_video_track_ssrc4.ended = false; | 1642 expected_remote_video_track_ssrc4.ended = false; |
| 1640 expected_remote_video_track_ssrc4.detached = false; | 1643 expected_remote_video_track_ssrc4.detached = false; |
| 1644 expected_remote_video_track_ssrc4.frames_received = 0; |
| 1641 // Should be undefined: |expected_remote_video_track_ssrc4.frame_width| and | 1645 // Should be undefined: |expected_remote_video_track_ssrc4.frame_width| and |
| 1642 // |expected_remote_video_track_ssrc4.frame_height|. | 1646 // |expected_remote_video_track_ssrc4.frame_height|. |
| 1643 ASSERT_TRUE(report->Get(expected_remote_video_track_ssrc4.id())); | 1647 ASSERT_TRUE(report->Get(expected_remote_video_track_ssrc4.id())); |
| 1644 EXPECT_EQ(expected_remote_video_track_ssrc4, | 1648 EXPECT_EQ(expected_remote_video_track_ssrc4, |
| 1645 report->Get(expected_remote_video_track_ssrc4.id())->cast_to< | 1649 report->Get(expected_remote_video_track_ssrc4.id())->cast_to< |
| 1646 RTCMediaStreamTrackStats>()); | 1650 RTCMediaStreamTrackStats>()); |
| 1647 } | 1651 } |
| 1648 | 1652 |
| 1649 TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) { | 1653 TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) { |
| 1650 MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel(); | 1654 MockVoiceMediaChannel* voice_media_channel = new MockVoiceMediaChannel(); |
| (...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2241 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; | 2245 rtc::scoped_refptr<FakeRTCStatsCollector> collector_; |
| 2242 }; | 2246 }; |
| 2243 | 2247 |
| 2244 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { | 2248 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) { |
| 2245 collector_->VerifyThreadUsageAndResultsMerging(); | 2249 collector_->VerifyThreadUsageAndResultsMerging(); |
| 2246 } | 2250 } |
| 2247 | 2251 |
| 2248 } // namespace | 2252 } // namespace |
| 2249 | 2253 |
| 2250 } // namespace webrtc | 2254 } // namespace webrtc |
| OLD | NEW |