admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce log amount when running stats tests.

Browse Source 
Bug: none
Change-Id: Icd914ae909f2ea1853cc58f6217933f8d320ceb6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/250162
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35884}
This commit is contained in:
Tommi 2022-02-02 11:49:35 +01:00 committed by WebRTC LUCI CQ
parent c79dc98a60
commit 1901551b00
5 changed files with 43 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pc/peer_connection.cc
View File

@ -1169,6 +1169,9 @@ bool PeerConnection::GetStats(StatsObserver* observer,
RTC_LOG_THREAD_BLOCK_COUNT();
stats_->UpdateStats(level);
RTC_DCHECK_BLOCK_COUNT_NO_MORE_THAN(4);
// The StatsCollector is used to tell if a track is valid because it may
// remember tracks that the PeerConnection previously removed.
if (track && !stats_->IsValidTrack(track->id())) {

6
pc/rtc_stats_collector.cc
View File

@ -974,7 +974,7 @@ void ProduceSenderMediaTrackStats(
if (sender_info) {
voice_sender_info = sender_info;
} else {
RTC_LOG(LS_INFO)
RTC_DLOG(LS_INFO)
<< "RTCStatsCollector: No voice sender info for sender with ssrc "
<< sender->ssrc();
}
@ -1002,8 +1002,8 @@ void ProduceSenderMediaTrackStats(
if (sender_info) {
video_sender_info = sender_info;
} else {
RTC_LOG(LS_INFO) << "No video sender info for sender with ssrc "
<< sender->ssrc();
RTC_DLOG(LS_INFO)
<< "No video sender info for sender with ssrc " << sender->ssrc();
}
}
std::unique_ptr<RTCMediaStreamTrackStats> video_track_stats =

64
pc/rtc_stats_collector_unittest.cc
View File

@ -591,11 +591,8 @@ class RTCStatsCollectorWrapper {
pc_->AddReceiver(rtp_receiver);
}
auto* voice_media_channel = pc_->AddVoiceChannel("audio", "transport");
voice_media_channel->SetStats(voice_media_info);
auto* video_media_channel = pc_->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_media_info);
pc_->AddVoiceChannel("audio", "transport", voice_media_info);
pc_->AddVideoChannel("video", "transport", video_media_info);
}
private:
@ -703,9 +700,7 @@ class RTCStatsCollectorTest : public ::testing::Test {
video_media_info.receivers[0].codec_payload_type = recv_codec.payload_type;
// transport
graph.transport_id = "RTCTransport_TransportName_1";
auto* video_media_channel =
pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
// track (sender)
graph.sender = stats_->SetupLocalTrackAndSender(
cricket::MEDIA_TYPE_VIDEO, "LocalVideoTrackID", 3, false, 50);
@ -818,9 +813,7 @@ class RTCStatsCollectorTest : public ::testing::Test {
// transport
graph.transport_id = "RTCTransport_TransportName_1";
auto* video_media_channel =
pc_->AddVoiceChannel("VoiceMid", "TransportName");
video_media_channel->SetStats(media_info);
pc_->AddVoiceChannel("VoiceMid", "TransportName", media_info);
// track (sender)
graph.sender = stats_->SetupLocalTrackAndSender(
cricket::MEDIA_TYPE_AUDIO, "LocalAudioTrackID", kLocalSsrc, false, 50);
@ -1004,8 +997,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) {
voice_media_info.send_codecs.insert(
std::make_pair(outbound_audio_codec.payload_type, outbound_audio_codec));
auto* voice_media_channel = pc_->AddVoiceChannel("AudioMid", "TransportName");
voice_media_channel->SetStats(voice_media_info);
pc_->AddVoiceChannel("AudioMid", "TransportName", voice_media_info);
// Video
cricket::VideoMediaInfo video_media_info;
@ -1029,8 +1021,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) {
video_media_info.send_codecs.insert(
std::make_pair(outbound_video_codec.payload_type, outbound_video_codec));
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
rtc::scoped_refptr<const RTCStatsReport> report = stats_->GetStatsReport();
@ -1093,6 +1084,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsMultiple) {
const char kVideoTransport[] = "video";
pc_->AddVoiceChannel("audio", kAudioTransport);
std::unique_ptr<CertificateInfo> audio_local_certinfo =
CreateFakeCertificateAndInfoFromDers(
std::vector<std::string>({"(local) audio"}));
@ -2010,8 +2002,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) {
voice_media_info.receive_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
auto* voice_media_channel = pc_->AddVoiceChannel("AudioMid", "TransportName");
voice_media_channel->SetStats(voice_media_info);
auto* voice_media_channel =
pc_->AddVoiceChannel("AudioMid", "TransportName", voice_media_info);
stats_->SetupRemoteTrackAndReceiver(
cricket::MEDIA_TYPE_AUDIO, "RemoteAudioTrackID", "RemoteStreamId", 1);
@ -2115,8 +2107,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) {
video_media_info.receive_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
auto* video_media_channel =
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
stats_->SetupRemoteTrackAndReceiver(
cricket::MEDIA_TYPE_VIDEO, "RemoteVideoTrackID", "RemoteStreamId", 1);
@ -2204,8 +2196,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
voice_media_info.send_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
auto* voice_media_channel = pc_->AddVoiceChannel("AudioMid", "TransportName");
voice_media_channel->SetStats(voice_media_info);
pc_->AddVoiceChannel("AudioMid", "TransportName", voice_media_info);
stats_->SetupLocalTrackAndSender(cricket::MEDIA_TYPE_AUDIO,
"LocalAudioTrackID", 1, true,
/*attachment_id=*/50);
@ -2286,8 +2277,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
video_media_info.send_codecs.insert(
std::make_pair(codec_parameters.payload_type, codec_parameters));
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
auto* video_media_channel =
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
stats_->SetupLocalTrackAndSender(cricket::MEDIA_TYPE_VIDEO,
"LocalVideoTrackID", 1, true,
/*attachment_id=*/50);
@ -2605,8 +2596,7 @@ TEST_F(RTCStatsCollectorTest, CollectNoStreamRTCOutboundRTPStreamStats_Audio) {
std::make_pair(codec_parameters.payload_type, codec_parameters));
// Emulates the case where AddTrack is used without an associated MediaStream
auto* voice_media_channel = pc_->AddVoiceChannel("AudioMid", "TransportName");
voice_media_channel->SetStats(voice_media_info);
pc_->AddVoiceChannel("AudioMid", "TransportName", voice_media_info);
stats_->SetupLocalTrackAndSender(cricket::MEDIA_TYPE_AUDIO,
"LocalAudioTrackID", 1, false,
/*attachment_id=*/50);
@ -2652,8 +2642,7 @@ TEST_F(RTCStatsCollectorTest, RTCAudioSourceStatsCollectedForSenderWithTrack) {
voice_media_info.senders[0].apm_statistics.echo_return_loss = 42.0;
voice_media_info.senders[0].apm_statistics.echo_return_loss_enhancement =
52.0;
auto* voice_media_channel = pc_->AddVoiceChannel("AudioMid", "TransportName");
voice_media_channel->SetStats(voice_media_info);
pc_->AddVoiceChannel("AudioMid", "TransportName", voice_media_info);
stats_->SetupLocalTrackAndSender(cricket::MEDIA_TYPE_AUDIO,
"LocalAudioTrackID", kSsrc, false,
kAttachmentId);
@ -2692,8 +2681,7 @@ TEST_F(RTCStatsCollectorTest, RTCVideoSourceStatsCollectedForSenderWithTrack) {
video_media_info.aggregated_senders[0].local_stats[0].ssrc = kSsrc;
video_media_info.aggregated_senders[0].framerate_input = 29.0;
video_media_info.aggregated_senders[0].frames = 10001;
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
auto video_source = FakeVideoTrackSourceForStats::Create(kVideoSourceWidth,
kVideoSourceHeight);
@ -2736,8 +2724,7 @@ TEST_F(RTCStatsCollectorTest,
video_media_info.senders.push_back(cricket::VideoSenderInfo());
video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo());
video_media_info.senders[0].framerate_input = 29.0;
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
auto video_source = FakeVideoTrackSourceForStats::Create(kVideoSourceWidth,
kVideoSourceHeight);
@ -2767,8 +2754,7 @@ TEST_F(RTCStatsCollectorTest,
video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo());
video_media_info.senders[0].local_stats[0].ssrc = kSsrc;
video_media_info.senders[0].framerate_input = 29.0;
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
auto video_track = FakeVideoTrackForStats::Create(
"LocalVideoTrackID", MediaStreamTrackInterface::kLive,
@ -2794,8 +2780,7 @@ TEST_F(RTCStatsCollectorTest,
voice_media_info.senders.push_back(cricket::VoiceSenderInfo());
voice_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo());
voice_media_info.senders[0].local_stats[0].ssrc = kSsrc;
auto* voice_media_channel = pc_->AddVoiceChannel("AudioMid", "TransportName");
voice_media_channel->SetStats(voice_media_info);
pc_->AddVoiceChannel("AudioMid", "TransportName", voice_media_info);
rtc::scoped_refptr<MockRtpSenderInternal> sender = CreateMockSender(
cricket::MEDIA_TYPE_AUDIO, /*track=*/nullptr, kSsrc, kAttachmentId, {});
pc_->AddSender(sender);
@ -2855,8 +2840,7 @@ class RTCStatsCollectorTestWithParamKind
sender.report_block_datas.push_back(report_block_data);
voice_media_info.senders.push_back(sender);
}
auto* voice_media_channel = pc_->AddVoiceChannel("mid", transport_name);
voice_media_channel->SetStats(voice_media_info);
pc_->AddVoiceChannel("mid", transport_name, voice_media_info);
return;
}
case cricket::MEDIA_TYPE_VIDEO: {
@ -2875,8 +2859,7 @@ class RTCStatsCollectorTestWithParamKind
video_media_info.aggregated_senders.push_back(sender);
video_media_info.senders.push_back(sender);
}
auto* video_media_channel = pc_->AddVideoChannel("mid", transport_name);
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("mid", transport_name, video_media_info);
return;
}
case cricket::MEDIA_TYPE_DATA:
@ -3119,8 +3102,7 @@ TEST_F(RTCStatsCollectorTest,
video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo());
video_media_info.senders[0].local_stats[0].ssrc = kSsrc;
video_media_info.senders[0].framerate_input = 29.0;
auto* video_media_channel = pc_->AddVideoChannel("VideoMid", "TransportName");
video_media_channel->SetStats(video_media_info);
pc_->AddVideoChannel("VideoMid", "TransportName", video_media_info);
rtc::scoped_refptr<MockRtpSenderInternal> sender = CreateMockSender(
cricket::MEDIA_TYPE_VIDEO, /*track=*/nullptr, kSsrc, kAttachmentId, {});

25
pc/stats_collector_unittest.cc
View File

@ -919,8 +919,7 @@ TEST_P(StatsCollectorTrackTest, BytesCounterHandles64Bits) {
VideoMediaInfo video_info;
video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
AddOutgoingVideoTrack(pc, stats.get());
@ -1002,8 +1001,7 @@ TEST_P(StatsCollectorTrackTest, VideoBandwidthEstimationInfoIsReported) {
VideoMediaInfo video_info;
video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
AddOutgoingVideoTrack(pc, stats.get());
@ -1100,8 +1098,7 @@ TEST_P(StatsCollectorTrackTest, TrackAndSsrcObjectExistAfterUpdateSsrcStats) {
VideoMediaInfo video_info;
video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
AddOutgoingVideoTrack(pc, stats.get());
@ -1155,8 +1152,7 @@ TEST_P(StatsCollectorTrackTest, TransportObjectLinkedFromSsrcObject) {
VideoMediaInfo video_info;
video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
AddOutgoingVideoTrack(pc, stats.get());
@ -1218,8 +1214,7 @@ TEST_P(StatsCollectorTrackTest, RemoteSsrcInfoIsPresent) {
VideoMediaInfo video_info;
video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
AddOutgoingVideoTrack(pc, stats.get());
@ -1247,8 +1242,7 @@ TEST_P(StatsCollectorTrackTest, ReportsFromRemoteTrack) {
VideoMediaInfo video_info;
video_info.receivers.push_back(video_receiver_info);
auto* video_media_info = pc->AddVideoChannel("video", "transport");
video_media_info->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
AddIncomingVideoTrack(pc, stats.get());
@ -1816,7 +1810,6 @@ TEST_P(StatsCollectorTrackTest, TwoLocalSendersWithSameTrack) {
StatsReports reports;
stats->GetStats(local_track.get(), &reports);
RTC_LOG(LS_INFO) << reports.size();
// Both SSRC reports have the same track ID.
EXPECT_EQ(kLocalTrackId, GetValueInNthReportByType(
@ -1858,8 +1851,7 @@ TEST_P(StatsCollectorTrackTest, VerifyVideoSendSsrcStats) {
VideoMediaInfo video_info;
video_info.aggregated_senders.push_back(video_sender_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
stats->UpdateStats(PeerConnectionInterface::kStatsOutputLevelStandard);
StatsReports reports;
@ -1886,8 +1878,7 @@ TEST_P(StatsCollectorTrackTest, VerifyVideoReceiveSsrcStatsNew) {
VideoMediaInfo video_info;
video_info.receivers.push_back(video_receiver_info);
auto* video_media_channel = pc->AddVideoChannel("video", "transport");
video_media_channel->SetStats(video_info);
pc->AddVideoChannel("video", "transport", video_info);
stats->UpdateStats(PeerConnectionInterface::kStatsOutputLevelStandard);
StatsReports reports;

8
pc/test/fake_peer_connection_for_stats.h
View File

@ -203,7 +203,8 @@ class FakePeerConnectionForStats : public FakePeerConnectionBase {
FakeVoiceMediaChannelForStats* AddVoiceChannel(
const std::string& mid,
const std::string& transport_name) {
const std::string& transport_name,
cricket::VoiceMediaInfo initial_stats = cricket::VoiceMediaInfo()) {
RTC_DCHECK(!voice_channel_);
auto voice_media_channel =
std::make_unique<FakeVoiceMediaChannelForStats>(network_thread_);
@ -217,12 +218,14 @@ class FakePeerConnectionForStats : public FakePeerConnectionBase {
->internal()
->SetChannel(voice_channel_.get(),
[](const std::string&) { return nullptr; });
voice_media_channel_ptr->SetStats(initial_stats);
return voice_media_channel_ptr;
}
FakeVideoMediaChannelForStats* AddVideoChannel(
const std::string& mid,
const std::string& transport_name) {
const std::string& transport_name,
cricket::VideoMediaInfo initial_stats = cricket::VideoMediaInfo()) {
RTC_DCHECK(!video_channel_);
auto video_media_channel =
std::make_unique<FakeVideoMediaChannelForStats>(network_thread_);
@ -236,6 +239,7 @@ class FakePeerConnectionForStats : public FakePeerConnectionBase {
->internal()
->SetChannel(video_channel_.get(),
[](const std::string&) { return nullptr; });
video_media_channel_ptr->SetStats(initial_stats);
return video_media_channel_ptr;
}