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

Add metric for decode time and max decode time in video quality tests.

Browse Source 
BUG=chromium:672007

Review-Url: https://codereview.webrtc.org/2640263002
Cr-Commit-Position: refs/heads/master@{#16208}
This commit is contained in:
philipel 2017-01-23 03:22:15 -08:00 committed by Commit bot
parent 011240333e
commit fd870db0b2
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
webrtc/video/video_quality_test.cc
View File

@ -137,6 +137,7 @@ class VideoAnalyzer : public PacketReceiver,
: transport_(transport), : transport_(transport),
receiver_(nullptr), receiver_(nullptr),
send_stream_(nullptr), send_stream_(nullptr),
receive_stream_(nullptr),
captured_frame_forwarder_(this), captured_frame_forwarder_(this),
test_label_(test_label), test_label_(test_label),
graph_data_output_file_(graph_data_output_file), graph_data_output_file_(graph_data_output_file),
@ -199,6 +200,12 @@ class VideoAnalyzer : public PacketReceiver,
send_stream_ = stream; send_stream_ = stream;
} }
void SetReceiveStream(VideoReceiveStream* stream) {
rtc::CritScope lock(&crit_);
RTC_DCHECK(!receive_stream_);
receive_stream_ = stream;
}
rtc::VideoSinkInterface<VideoFrame>* InputInterface() { rtc::VideoSinkInterface<VideoFrame>* InputInterface() {
return &captured_frame_forwarder_; return &captured_frame_forwarder_;
} }
@ -532,19 +539,27 @@ class VideoAnalyzer : public PacketReceiver,
if (done_.Wait(kSendStatsPollingIntervalMs)) if (done_.Wait(kSendStatsPollingIntervalMs))
return false; return false;
VideoSendStream::Stats stats = send_stream_->GetStats();
rtc::CritScope crit(&comparison_lock_); rtc::CritScope crit(&comparison_lock_);
VideoSendStream::Stats send_stats = send_stream_->GetStats();
// It's not certain that we yet have estimates for any of these stats. Check // It's not certain that we yet have estimates for any of these stats. Check
// that they are positive before mixing them in. // that they are positive before mixing them in.
if (stats.encode_frame_rate > 0) if (send_stats.encode_frame_rate > 0)
encode_frame_rate_.AddSample(stats.encode_frame_rate); encode_frame_rate_.AddSample(send_stats.encode_frame_rate);
if (stats.avg_encode_time_ms > 0) if (send_stats.avg_encode_time_ms > 0)
encode_time_ms.AddSample(stats.avg_encode_time_ms); encode_time_ms_.AddSample(send_stats.avg_encode_time_ms);
if (stats.encode_usage_percent > 0) if (send_stats.encode_usage_percent > 0)
encode_usage_percent.AddSample(stats.encode_usage_percent); encode_usage_percent_.AddSample(send_stats.encode_usage_percent);
if (stats.media_bitrate_bps > 0) if (send_stats.media_bitrate_bps > 0)
media_bitrate_bps.AddSample(stats.media_bitrate_bps); media_bitrate_bps_.AddSample(send_stats.media_bitrate_bps);
if (receive_stream_ != nullptr) {
VideoReceiveStream::Stats receive_stats = receive_stream_->GetStats();
if (receive_stats.decode_ms > 0)
decode_time_ms_.AddSample(receive_stats.decode_ms);
if (receive_stats.max_decode_ms > 0)
decode_time_max_ms_.AddSample(receive_stats.max_decode_ms);
}
return true; return true;
} }
@ -633,9 +648,14 @@ class VideoAnalyzer : public PacketReceiver,
PrintResult("time_between_rendered_frames", rendered_delta_, " ms"); PrintResult("time_between_rendered_frames", rendered_delta_, " ms");
PrintResult("encoded_frame_size", encoded_frame_size_, " bytes"); PrintResult("encoded_frame_size", encoded_frame_size_, " bytes");
PrintResult("encode_frame_rate", encode_frame_rate_, " fps"); PrintResult("encode_frame_rate", encode_frame_rate_, " fps");
PrintResult("encode_time", encode_time_ms, " ms"); PrintResult("encode_time", encode_time_ms_, " ms");
PrintResult("encode_usage_percent", encode_usage_percent, " percent"); PrintResult("encode_usage_percent", encode_usage_percent_, " percent");
PrintResult("media_bitrate", media_bitrate_bps, " bps"); PrintResult("media_bitrate", media_bitrate_bps_, " bps");
if (receive_stream_ != nullptr) {
PrintResult("decode_time", decode_time_ms_, " ms");
PrintResult("decode_time_max", decode_time_max_ms_, " ms");
}
printf("RESULT dropped_frames: %s = %d frames\n", test_label_.c_str(), printf("RESULT dropped_frames: %s = %d frames\n", test_label_.c_str(),
dropped_frames_); dropped_frames_);
@ -806,6 +826,7 @@ class VideoAnalyzer : public PacketReceiver,
} }
VideoSendStream* send_stream_; VideoSendStream* send_stream_;
VideoReceiveStream* receive_stream_;
CapturedFrameForwarder captured_frame_forwarder_; CapturedFrameForwarder captured_frame_forwarder_;
const std::string test_label_; const std::string test_label_;
FILE* const graph_data_output_file_; FILE* const graph_data_output_file_;
@ -823,9 +844,11 @@ class VideoAnalyzer : public PacketReceiver,
test::Statistics rendered_delta_ GUARDED_BY(comparison_lock_); test::Statistics rendered_delta_ GUARDED_BY(comparison_lock_);
test::Statistics encoded_frame_size_ GUARDED_BY(comparison_lock_); test::Statistics encoded_frame_size_ GUARDED_BY(comparison_lock_);
test::Statistics encode_frame_rate_ GUARDED_BY(comparison_lock_); test::Statistics encode_frame_rate_ GUARDED_BY(comparison_lock_);
test::Statistics encode_time_ms GUARDED_BY(comparison_lock_); test::Statistics encode_time_ms_ GUARDED_BY(comparison_lock_);
test::Statistics encode_usage_percent GUARDED_BY(comparison_lock_); test::Statistics encode_usage_percent_ GUARDED_BY(comparison_lock_);
test::Statistics media_bitrate_bps GUARDED_BY(comparison_lock_); test::Statistics decode_time_ms_ GUARDED_BY(comparison_lock_);
test::Statistics decode_time_max_ms_ GUARDED_BY(comparison_lock_);
test::Statistics media_bitrate_bps_ GUARDED_BY(comparison_lock_);
const int frames_to_process_; const int frames_to_process_;
int frames_recorded_; int frames_recorded_;
@ -1309,6 +1332,8 @@ void VideoQualityTest::RunWithAnalyzer(const Params& params) {
CreateFlexfecStreams(); CreateFlexfecStreams();
CreateVideoStreams(); CreateVideoStreams();
analyzer.SetSendStream(video_send_stream_); analyzer.SetSendStream(video_send_stream_);
if (video_receive_streams_.size() == 1)
analyzer.SetReceiveStream(video_receive_streams_[0]);
video_send_stream_->SetSource( video_send_stream_->SetSource(
analyzer.OutputInterface(), analyzer.OutputInterface(),
VideoSendStream::DegradationPreference::kBalanced); VideoSendStream::DegradationPreference::kBalanced);