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