Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Side by Side Diff: talk/app/webrtc/statscollector_unittest.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanups. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 .WillRepeatedly(Return(false)); 797 .WillRepeatedly(Return(false));
798 798
799 const char kVideoChannelName[] = "video"; 799 const char kVideoChannelName[] = "video";
800 800
801 InitSessionStats(kVideoChannelName); 801 InitSessionStats(kVideoChannelName);
802 EXPECT_CALL(session_, GetTransportStats(_)) 802 EXPECT_CALL(session_, GetTransportStats(_))
803 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_), 803 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_),
804 Return(true))); 804 Return(true)));
805 805
806 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 806 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
807 cricket::VideoChannel video_channel(rtc::Thread::Current(), 807 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
808 media_channel, NULL, kVideoChannelName, false); 808 nullptr, nullptr, kVideoChannelName,
809 false);
809 StatsReports reports; // returned values. 810 StatsReports reports; // returned values.
810 cricket::VideoSenderInfo video_sender_info; 811 cricket::VideoSenderInfo video_sender_info;
811 cricket::VideoMediaInfo stats_read; 812 cricket::VideoMediaInfo stats_read;
812 // The number of bytes must be larger than 0xFFFFFFFF for this test. 813 // The number of bytes must be larger than 0xFFFFFFFF for this test.
813 const int64 kBytesSent = 12345678901234LL; 814 const int64 kBytesSent = 12345678901234LL;
814 const std::string kBytesSentString("12345678901234"); 815 const std::string kBytesSentString("12345678901234");
815 816
816 AddOutgoingVideoTrackStats(); 817 AddOutgoingVideoTrackStats();
817 stats.AddStream(stream_); 818 stats.AddStream(stream_);
818 819
(...skipping 24 matching lines...) Expand all
843 .WillRepeatedly(Return(false)); 844 .WillRepeatedly(Return(false));
844 845
845 const char kVideoChannelName[] = "video"; 846 const char kVideoChannelName[] = "video";
846 847
847 InitSessionStats(kVideoChannelName); 848 InitSessionStats(kVideoChannelName);
848 EXPECT_CALL(session_, GetTransportStats(_)) 849 EXPECT_CALL(session_, GetTransportStats(_))
849 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_), 850 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_),
850 Return(true))); 851 Return(true)));
851 852
852 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 853 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
853 cricket::VideoChannel video_channel(rtc::Thread::Current(), 854 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
854 media_channel, NULL, kVideoChannelName, false); 855 nullptr, nullptr, kVideoChannelName,
856 false);
855 857
856 StatsReports reports; // returned values. 858 StatsReports reports; // returned values.
857 cricket::VideoSenderInfo video_sender_info; 859 cricket::VideoSenderInfo video_sender_info;
858 cricket::VideoMediaInfo stats_read; 860 cricket::VideoMediaInfo stats_read;
859 // Set up an SSRC just to test that we get both kinds of stats back: SSRC and 861 // Set up an SSRC just to test that we get both kinds of stats back: SSRC and
860 // BWE. 862 // BWE.
861 const int64 kBytesSent = 12345678901234LL; 863 const int64 kBytesSent = 12345678901234LL;
862 const std::string kBytesSentString("12345678901234"); 864 const std::string kBytesSentString("12345678901234");
863 865
864 AddOutgoingVideoTrackStats(); 866 AddOutgoingVideoTrackStats();
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 reports, StatsReport::kStatsReportTypeSession, 2); 924 reports, StatsReport::kStatsReportTypeSession, 2);
923 EXPECT_EQ(NULL, session_report); 925 EXPECT_EQ(NULL, session_report);
924 } 926 }
925 927
926 // This test verifies that the empty track report exists in the returned stats 928 // This test verifies that the empty track report exists in the returned stats
927 // without calling StatsCollector::UpdateStats. 929 // without calling StatsCollector::UpdateStats.
928 TEST_F(StatsCollectorTest, TrackObjectExistsWithoutUpdateStats) { 930 TEST_F(StatsCollectorTest, TrackObjectExistsWithoutUpdateStats) {
929 StatsCollectorForTest stats(&session_); 931 StatsCollectorForTest stats(&session_);
930 932
931 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 933 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
932 cricket::VideoChannel video_channel(rtc::Thread::Current(), 934 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
933 media_channel, NULL, "video", false); 935 nullptr, nullptr, "video", false);
934 AddOutgoingVideoTrackStats(); 936 AddOutgoingVideoTrackStats();
935 stats.AddStream(stream_); 937 stats.AddStream(stream_);
936 938
937 // Verfies the existence of the track report. 939 // Verfies the existence of the track report.
938 StatsReports reports; 940 StatsReports reports;
939 stats.GetStats(NULL, &reports); 941 stats.GetStats(NULL, &reports);
940 EXPECT_EQ((size_t)1, reports.size()); 942 EXPECT_EQ((size_t)1, reports.size());
941 EXPECT_EQ(StatsReport::kStatsReportTypeTrack, reports[0]->type()); 943 EXPECT_EQ(StatsReport::kStatsReportTypeTrack, reports[0]->type());
942 EXPECT_EQ(0, reports[0]->timestamp()); 944 EXPECT_EQ(0, reports[0]->timestamp());
943 945
(...skipping 14 matching lines...) Expand all
958 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 960 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
959 .WillRepeatedly(Return(false)); 961 .WillRepeatedly(Return(false));
960 962
961 const char kVideoChannelName[] = "video"; 963 const char kVideoChannelName[] = "video";
962 InitSessionStats(kVideoChannelName); 964 InitSessionStats(kVideoChannelName);
963 EXPECT_CALL(session_, GetTransportStats(_)) 965 EXPECT_CALL(session_, GetTransportStats(_))
964 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_), 966 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_),
965 Return(true))); 967 Return(true)));
966 968
967 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 969 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
968 cricket::VideoChannel video_channel(rtc::Thread::Current(), 970 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
969 media_channel, NULL, kVideoChannelName, false); 971 nullptr, nullptr, kVideoChannelName,
972 false);
970 AddOutgoingVideoTrackStats(); 973 AddOutgoingVideoTrackStats();
971 stats.AddStream(stream_); 974 stats.AddStream(stream_);
972 975
973 // Constructs an ssrc stats update. 976 // Constructs an ssrc stats update.
974 cricket::VideoSenderInfo video_sender_info; 977 cricket::VideoSenderInfo video_sender_info;
975 cricket::VideoMediaInfo stats_read; 978 cricket::VideoMediaInfo stats_read;
976 const int64 kBytesSent = 12345678901234LL; 979 const int64 kBytesSent = 12345678901234LL;
977 980
978 // Construct a stats value to read. 981 // Construct a stats value to read.
979 video_sender_info.add_ssrc(1234); 982 video_sender_info.add_ssrc(1234);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1022 StatsCollectorForTest stats(&session_); 1025 StatsCollectorForTest stats(&session_);
1023 1026
1024 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1027 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1025 .WillRepeatedly(Return(false)); 1028 .WillRepeatedly(Return(false));
1026 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1029 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1027 .WillRepeatedly(Return(false)); 1030 .WillRepeatedly(Return(false));
1028 1031
1029 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 1032 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
1030 // The transport_name known by the video channel. 1033 // The transport_name known by the video channel.
1031 const std::string kVcName("vcname"); 1034 const std::string kVcName("vcname");
1032 cricket::VideoChannel video_channel(rtc::Thread::Current(), 1035 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
1033 media_channel, NULL, kVcName, false); 1036 nullptr, nullptr, kVcName, false);
1034 AddOutgoingVideoTrackStats(); 1037 AddOutgoingVideoTrackStats();
1035 stats.AddStream(stream_); 1038 stats.AddStream(stream_);
1036 1039
1037 // Constructs an ssrc stats update. 1040 // Constructs an ssrc stats update.
1038 cricket::VideoSenderInfo video_sender_info; 1041 cricket::VideoSenderInfo video_sender_info;
1039 cricket::VideoMediaInfo stats_read; 1042 cricket::VideoMediaInfo stats_read;
1040 const int64 kBytesSent = 12345678901234LL; 1043 const int64 kBytesSent = 12345678901234LL;
1041 1044
1042 // Construct a stats value to read. 1045 // Construct a stats value to read.
1043 video_sender_info.add_ssrc(1234); 1046 video_sender_info.add_ssrc(1234);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 } 1083 }
1081 1084
1082 // This test verifies that a remote stats object will not be created for 1085 // This test verifies that a remote stats object will not be created for
1083 // an outgoing SSRC where remote stats are not returned. 1086 // an outgoing SSRC where remote stats are not returned.
1084 TEST_F(StatsCollectorTest, RemoteSsrcInfoIsAbsent) { 1087 TEST_F(StatsCollectorTest, RemoteSsrcInfoIsAbsent) {
1085 StatsCollectorForTest stats(&session_); 1088 StatsCollectorForTest stats(&session_);
1086 1089
1087 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 1090 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
1088 // The transport_name known by the video channel. 1091 // The transport_name known by the video channel.
1089 const std::string kVcName("vcname"); 1092 const std::string kVcName("vcname");
1090 cricket::VideoChannel video_channel(rtc::Thread::Current(), 1093 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
1091 media_channel, NULL, kVcName, false); 1094 nullptr, nullptr, kVcName, false);
1092 AddOutgoingVideoTrackStats(); 1095 AddOutgoingVideoTrackStats();
1093 stats.AddStream(stream_); 1096 stats.AddStream(stream_);
1094 1097
1095 EXPECT_CALL(session_, video_channel()).WillRepeatedly(ReturnNull()); 1098 EXPECT_CALL(session_, video_channel()).WillRepeatedly(ReturnNull());
1096 EXPECT_CALL(session_, voice_channel()).WillRepeatedly(ReturnNull()); 1099 EXPECT_CALL(session_, voice_channel()).WillRepeatedly(ReturnNull());
1097 1100
1098 stats.UpdateStats(PeerConnectionInterface::kStatsOutputLevelStandard); 1101 stats.UpdateStats(PeerConnectionInterface::kStatsOutputLevelStandard);
1099 StatsReports reports; 1102 StatsReports reports;
1100 stats.GetStats(NULL, &reports); 1103 stats.GetStats(NULL, &reports);
1101 const StatsReport* remote_report = FindNthReportByType(reports, 1104 const StatsReport* remote_report = FindNthReportByType(reports,
1102 StatsReport::kStatsReportTypeRemoteSsrc, 1); 1105 StatsReport::kStatsReportTypeRemoteSsrc, 1);
1103 EXPECT_TRUE(remote_report == NULL); 1106 EXPECT_TRUE(remote_report == NULL);
1104 } 1107 }
1105 1108
1106 // This test verifies that a remote stats object will be created for 1109 // This test verifies that a remote stats object will be created for
1107 // an outgoing SSRC where stats are returned. 1110 // an outgoing SSRC where stats are returned.
1108 TEST_F(StatsCollectorTest, RemoteSsrcInfoIsPresent) { 1111 TEST_F(StatsCollectorTest, RemoteSsrcInfoIsPresent) {
1109 StatsCollectorForTest stats(&session_); 1112 StatsCollectorForTest stats(&session_);
1110 1113
1111 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1114 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1112 .WillRepeatedly(Return(false)); 1115 .WillRepeatedly(Return(false));
1113 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1116 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1114 .WillRepeatedly(Return(false)); 1117 .WillRepeatedly(Return(false));
1115 1118
1116 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 1119 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
1117 // The transport_name known by the video channel. 1120 // The transport_name known by the video channel.
1118 const std::string kVcName("vcname"); 1121 const std::string kVcName("vcname");
1119 cricket::VideoChannel video_channel(rtc::Thread::Current(), 1122 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
1120 media_channel, NULL, kVcName, false); 1123 nullptr, NULL, kVcName, false);
1121 AddOutgoingVideoTrackStats(); 1124 AddOutgoingVideoTrackStats();
1122 stats.AddStream(stream_); 1125 stats.AddStream(stream_);
1123 1126
1124 // Instruct the session to return stats containing the transport channel. 1127 // Instruct the session to return stats containing the transport channel.
1125 InitSessionStats(kVcName); 1128 InitSessionStats(kVcName);
1126 EXPECT_CALL(session_, GetTransportStats(_)) 1129 EXPECT_CALL(session_, GetTransportStats(_))
1127 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_), 1130 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_),
1128 Return(true))); 1131 Return(true)));
1129 1132
1130 // Constructs an ssrc stats update. 1133 // Constructs an ssrc stats update.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1167 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1165 .WillRepeatedly(Return(false)); 1168 .WillRepeatedly(Return(false));
1166 1169
1167 const char kVideoChannelName[] = "video"; 1170 const char kVideoChannelName[] = "video";
1168 InitSessionStats(kVideoChannelName); 1171 InitSessionStats(kVideoChannelName);
1169 EXPECT_CALL(session_, GetTransportStats(_)) 1172 EXPECT_CALL(session_, GetTransportStats(_))
1170 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_), 1173 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_),
1171 Return(true))); 1174 Return(true)));
1172 1175
1173 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); 1176 MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
1174 cricket::VideoChannel video_channel(rtc::Thread::Current(), 1177 cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
1175 media_channel, NULL, kVideoChannelName, false); 1178 nullptr, nullptr, kVideoChannelName,
1179 false);
1176 AddIncomingVideoTrackStats(); 1180 AddIncomingVideoTrackStats();
1177 stats.AddStream(stream_); 1181 stats.AddStream(stream_);
1178 1182
1179 // Constructs an ssrc stats update. 1183 // Constructs an ssrc stats update.
1180 cricket::VideoReceiverInfo video_receiver_info; 1184 cricket::VideoReceiverInfo video_receiver_info;
1181 cricket::VideoMediaInfo stats_read; 1185 cricket::VideoMediaInfo stats_read;
1182 const int64 kNumOfPacketsConcealed = 54321; 1186 const int64 kNumOfPacketsConcealed = 54321;
1183 1187
1184 // Construct a stats value to read. 1188 // Construct a stats value to read.
1185 video_receiver_info.add_ssrc(1234); 1189 video_receiver_info.add_ssrc(1234);
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 StatsCollectorForTest stats(&session_); 1483 StatsCollectorForTest stats(&session_);
1480 1484
1481 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1485 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1482 .WillRepeatedly(Return(false)); 1486 .WillRepeatedly(Return(false));
1483 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1487 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1484 .WillRepeatedly(Return(false)); 1488 .WillRepeatedly(Return(false));
1485 1489
1486 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel(); 1490 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
1487 // The transport_name known by the voice channel. 1491 // The transport_name known by the voice channel.
1488 const std::string kVcName("vcname"); 1492 const std::string kVcName("vcname");
1489 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), 1493 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
1490 media_engine_, media_channel, NULL, kVcName, false); 1494 media_channel, nullptr, nullptr, kVcName,
1495 false);
1491 AddOutgoingAudioTrackStats(); 1496 AddOutgoingAudioTrackStats();
1492 stats.AddStream(stream_); 1497 stats.AddStream(stream_);
1493 stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack); 1498 stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack);
1494 1499
1495 cricket::VoiceSenderInfo voice_sender_info; 1500 cricket::VoiceSenderInfo voice_sender_info;
1496 InitVoiceSenderInfo(&voice_sender_info); 1501 InitVoiceSenderInfo(&voice_sender_info);
1497 1502
1498 cricket::VoiceMediaInfo stats_read; 1503 cricket::VoiceMediaInfo stats_read;
1499 StatsReports reports; // returned values. 1504 StatsReports reports; // returned values.
1500 SetupAndVerifyAudioTrackStats( 1505 SetupAndVerifyAudioTrackStats(
(...skipping 13 matching lines...) Expand all
1514 StatsCollectorForTest stats(&session_); 1519 StatsCollectorForTest stats(&session_);
1515 1520
1516 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1521 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1517 .WillRepeatedly(Return(false)); 1522 .WillRepeatedly(Return(false));
1518 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1523 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1519 .WillRepeatedly(Return(false)); 1524 .WillRepeatedly(Return(false));
1520 1525
1521 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel(); 1526 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
1522 // The transport_name known by the voice channel. 1527 // The transport_name known by the voice channel.
1523 const std::string kVcName("vcname"); 1528 const std::string kVcName("vcname");
1524 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), 1529 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
1525 media_engine_, media_channel, NULL, kVcName, false); 1530 media_channel, nullptr, nullptr, kVcName,
1531 false);
1526 AddIncomingAudioTrackStats(); 1532 AddIncomingAudioTrackStats();
1527 stats.AddStream(stream_); 1533 stats.AddStream(stream_);
1528 1534
1529 cricket::VoiceReceiverInfo voice_receiver_info; 1535 cricket::VoiceReceiverInfo voice_receiver_info;
1530 InitVoiceReceiverInfo(&voice_receiver_info); 1536 InitVoiceReceiverInfo(&voice_receiver_info);
1531 voice_receiver_info.codec_name = "fake_codec"; 1537 voice_receiver_info.codec_name = "fake_codec";
1532 1538
1533 cricket::VoiceMediaInfo stats_read; 1539 cricket::VoiceMediaInfo stats_read;
1534 StatsReports reports; // returned values. 1540 StatsReports reports; // returned values.
1535 SetupAndVerifyAudioTrackStats( 1541 SetupAndVerifyAudioTrackStats(
1536 audio_track_.get(), stream_.get(), &stats, &voice_channel, kVcName, 1542 audio_track_.get(), stream_.get(), &stats, &voice_channel, kVcName,
1537 media_channel, NULL, &voice_receiver_info, &stats_read, &reports); 1543 media_channel, NULL, &voice_receiver_info, &stats_read, &reports);
1538 } 1544 }
1539 1545
1540 // This test verifies that a local stats object won't update its statistics 1546 // This test verifies that a local stats object won't update its statistics
1541 // after a RemoveLocalAudioTrack() call. 1547 // after a RemoveLocalAudioTrack() call.
1542 TEST_F(StatsCollectorTest, GetStatsAfterRemoveAudioStream) { 1548 TEST_F(StatsCollectorTest, GetStatsAfterRemoveAudioStream) {
1543 StatsCollectorForTest stats(&session_); 1549 StatsCollectorForTest stats(&session_);
1544 1550
1545 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1551 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1546 .WillRepeatedly(Return(false)); 1552 .WillRepeatedly(Return(false));
1547 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1553 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1548 .WillRepeatedly(Return(false)); 1554 .WillRepeatedly(Return(false));
1549 1555
1550 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel(); 1556 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
1551 // The transport_name known by the voice channel. 1557 // The transport_name known by the voice channel.
1552 const std::string kVcName("vcname"); 1558 const std::string kVcName("vcname");
1553 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), 1559 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
1554 media_engine_, media_channel, NULL, kVcName, false); 1560 media_channel, nullptr, nullptr, kVcName,
1561 false);
1555 AddOutgoingAudioTrackStats(); 1562 AddOutgoingAudioTrackStats();
1556 stats.AddStream(stream_); 1563 stats.AddStream(stream_);
1557 stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack); 1564 stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack);
1558 1565
1559 // Instruct the session to return stats containing the transport channel. 1566 // Instruct the session to return stats containing the transport channel.
1560 InitSessionStats(kVcName); 1567 InitSessionStats(kVcName);
1561 EXPECT_CALL(session_, GetTransportStats(_)) 1568 EXPECT_CALL(session_, GetTransportStats(_))
1562 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_), 1569 .WillRepeatedly(DoAll(SetArgPointee<0>(session_stats_),
1563 Return(true))); 1570 Return(true)));
1564 1571
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 StatsCollectorForTest stats(&session_); 1611 StatsCollectorForTest stats(&session_);
1605 1612
1606 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1613 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1607 .WillRepeatedly(Return(false)); 1614 .WillRepeatedly(Return(false));
1608 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1615 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1609 .WillRepeatedly(Return(false)); 1616 .WillRepeatedly(Return(false));
1610 1617
1611 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel(); 1618 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
1612 // The transport_name known by the voice channel. 1619 // The transport_name known by the voice channel.
1613 const std::string kVcName("vcname"); 1620 const std::string kVcName("vcname");
1614 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), 1621 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
1615 media_engine_, media_channel, NULL, kVcName, false); 1622 media_channel, nullptr, nullptr, kVcName,
1623 false);
1616 1624
1617 // Create a local stream with a local audio track and adds it to the stats. 1625 // Create a local stream with a local audio track and adds it to the stats.
1618 AddOutgoingAudioTrackStats(); 1626 AddOutgoingAudioTrackStats();
1619 stats.AddStream(stream_); 1627 stats.AddStream(stream_);
1620 stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack); 1628 stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack);
1621 1629
1622 // Create a remote stream with a remote audio track and adds it to the stats. 1630 // Create a remote stream with a remote audio track and adds it to the stats.
1623 rtc::scoped_refptr<webrtc::MediaStream> remote_stream( 1631 rtc::scoped_refptr<webrtc::MediaStream> remote_stream(
1624 webrtc::MediaStream::Create("remotestreamlabel")); 1632 webrtc::MediaStream::Create("remotestreamlabel"));
1625 rtc::scoped_refptr<FakeAudioTrack> remote_track( 1633 rtc::scoped_refptr<FakeAudioTrack> remote_track(
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1691 StatsCollectorForTest stats(&session_); 1699 StatsCollectorForTest stats(&session_);
1692 1700
1693 EXPECT_CALL(session_, GetLocalCertificate(_, _)) 1701 EXPECT_CALL(session_, GetLocalCertificate(_, _))
1694 .WillRepeatedly(Return(false)); 1702 .WillRepeatedly(Return(false));
1695 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _)) 1703 EXPECT_CALL(session_, GetRemoteSSLCertificate(_, _))
1696 .WillRepeatedly(Return(false)); 1704 .WillRepeatedly(Return(false));
1697 1705
1698 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel(); 1706 MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
1699 // The transport_name known by the voice channel. 1707 // The transport_name known by the voice channel.
1700 const std::string kVcName("vcname"); 1708 const std::string kVcName("vcname");
1701 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), 1709 cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
1702 media_engine_, media_channel, NULL, kVcName, false); 1710 media_channel, nullptr, nullptr, kVcName,
1711 false);
1703 1712
1704 // Create a local stream with a local audio track and adds it to the stats. 1713 // Create a local stream with a local audio track and adds it to the stats.
1705 AddOutgoingAudioTrackStats(); 1714 AddOutgoingAudioTrackStats();
1706 stats.AddStream(stream_); 1715 stats.AddStream(stream_);
1707 stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack); 1716 stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack);
1708 1717
1709 cricket::VoiceSenderInfo voice_sender_info; 1718 cricket::VoiceSenderInfo voice_sender_info;
1710 voice_sender_info.add_ssrc(kSsrcOfTrack); 1719 voice_sender_info.add_ssrc(kSsrcOfTrack);
1711 1720
1712 cricket::VoiceMediaInfo stats_read; 1721 cricket::VoiceMediaInfo stats_read;
(...skipping 19 matching lines...) Expand all
1732 cricket::VoiceSenderInfo new_voice_sender_info; 1741 cricket::VoiceSenderInfo new_voice_sender_info;
1733 InitVoiceSenderInfo(&new_voice_sender_info); 1742 InitVoiceSenderInfo(&new_voice_sender_info);
1734 cricket::VoiceMediaInfo new_stats_read; 1743 cricket::VoiceMediaInfo new_stats_read;
1735 reports.clear(); 1744 reports.clear();
1736 SetupAndVerifyAudioTrackStats( 1745 SetupAndVerifyAudioTrackStats(
1737 new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName, 1746 new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName,
1738 media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports); 1747 media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports);
1739 } 1748 }
1740 1749
1741 } // namespace webrtc 1750 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698