Chromium Code Reviews| Index: chrome/browser/media/webrtc_browsertest_perf.cc |
| diff --git a/chrome/browser/media/webrtc_browsertest_perf.cc b/chrome/browser/media/webrtc_browsertest_perf.cc |
| index 68bce5d178310e8d3534ced74e3420f97b03aaee..c42c9123f3db3376b93823fed0eb1dab19ea2f51 100644 |
| --- a/chrome/browser/media/webrtc_browsertest_perf.cc |
| +++ b/chrome/browser/media/webrtc_browsertest_perf.cc |
| @@ -240,6 +240,31 @@ void PrintBweForVideoMetrics(const base::DictionaryValue& pc_dict, |
| void PrintMetricsForAllStreams(const base::DictionaryValue& pc_dict, |
| const std::string& modifier, |
| const std::string& video_codec) { |
| + PrintMetricsForSendStreams(pc_dict, modifier, video_codec); |
| + PrintMetricsForRecvStreams(pc_dict, modifier, video_codec); |
| +} |
| + |
| +void PrintMetricsForSendStreams(const base::DictionaryValue& pc_dict, |
| + const std::string& modifier, |
| + const std::string& video_codec) { |
| + std::string video_modifier = |
| + video_codec.empty() ? modifier : modifier + "_" + video_codec; |
| + const base::DictionaryValue* stats_dict; |
| + ASSERT_TRUE(pc_dict.GetDictionary("stats", &stats_dict)); |
| + std::set<std::string> ssrc_identifiers = FindAllSsrcIdentifiers(*stats_dict); |
| + |
| + std::set<std::string>::const_iterator ssrc_iterator = |
| + ssrc_identifiers.begin(); |
| + for (; ssrc_iterator != ssrc_identifiers.end(); ++ssrc_iterator) { |
| + const std::string& ssrc = *ssrc_iterator; |
| + MaybePrintResultsForAudioSend(ssrc, pc_dict, modifier); |
|
kjellander_chromium
2016/03/29 12:52:26
Shouldn't we continue to check the result of these
phoglund_chromium
2016/03/29 14:02:09
That would be nice, but it seemed clunky to implem
kjellander_chromium
2016/03/29 14:10:31
OK, but if we now never look at the result from th
phoglund_chromium
2016/03/29 14:37:24
Good point. Done
|
| + MaybePrintResultsForVideoSend(ssrc, pc_dict, video_modifier); |
| + } |
| +} |
| + |
| +void PrintMetricsForRecvStreams(const base::DictionaryValue& pc_dict, |
| + const std::string& modifier, |
| + const std::string& video_codec) { |
| std::string video_modifier = |
| video_codec.empty() ? modifier : modifier + "_" + video_codec; |
| const base::DictionaryValue* stats_dict; |
| @@ -249,17 +274,9 @@ void PrintMetricsForAllStreams(const base::DictionaryValue& pc_dict, |
| std::set<std::string>::const_iterator ssrc_iterator = |
| ssrc_identifiers.begin(); |
| for (; ssrc_iterator != ssrc_identifiers.end(); ++ssrc_iterator) { |
| - // Figure out which stream type this ssrc represents and print all the |
| - // interesting metrics for it. |
| const std::string& ssrc = *ssrc_iterator; |
| - bool did_recognize_stream_type = |
| - MaybePrintResultsForAudioReceive(ssrc, pc_dict, modifier) || |
| - MaybePrintResultsForAudioSend(ssrc, pc_dict, modifier) || |
| - MaybePrintResultsForVideoReceive(ssrc, pc_dict, video_modifier) || |
| - MaybePrintResultsForVideoSend(ssrc, pc_dict, video_modifier); |
| - ASSERT_TRUE(did_recognize_stream_type) << "Failed to figure out which " |
| - "kind of stream SSRC " << ssrc |
| - << " is. "; |
| + MaybePrintResultsForAudioReceive(ssrc, pc_dict, modifier); |
| + MaybePrintResultsForVideoReceive(ssrc, pc_dict, video_modifier); |
| } |
| } |