From 82b7ff5797cad828ae53218425ffd821947148c2 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 19 Mar 2019 16:45:14 +0100 Subject: [PATCH] Don't store last rendered frame in DefaultVideoQualityAnalyzer Bug: webrtc:10138 Change-Id: I1aec9b8e5abbc202cafcf7db74aba89182612308 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128578 Commit-Queue: Artem Titov Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#27183} --- .../pc/e2e/analyzer/video/default_video_quality_analyzer.cc | 6 ++---- test/pc/e2e/analyzer/video/default_video_quality_analyzer.h | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc index 5f88a97a2f..f4f4ce3c12 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc @@ -105,8 +105,7 @@ uint16_t DefaultVideoQualityAnalyzer::OnFrameCaptured( state->frame_ids.pop_front(); frame_counters_.dropped++; stream_frame_counters_[stream_label].dropped++; - AddComparison(it->second, state->last_rendered_frame, true, - stats_it->second); + AddComparison(it->second, absl::nullopt, true, stats_it->second); captured_frames_in_flight_.erase(it); frame_stats_.erase(stats_it); @@ -221,7 +220,7 @@ void DefaultVideoQualityAnalyzer::OnFrameRendered( auto dropped_frame_it = captured_frames_in_flight_.find(dropped_frame_id); RTC_CHECK(dropped_frame_it != captured_frames_in_flight_.end()); - AddComparison(dropped_frame_it->second, state->last_rendered_frame, true, + AddComparison(dropped_frame_it->second, absl::nullopt, true, dropped_frame_stats_it->second); frame_stats_.erase(dropped_frame_stats_it); @@ -230,7 +229,6 @@ void DefaultVideoQualityAnalyzer::OnFrameRendered( RTC_DCHECK(!state->frame_ids.empty()); state->frame_ids.pop_front(); - state->last_rendered_frame = frame; if (state->last_rendered_frame_time) { frame_stats->prev_frame_rendered_time = state->last_rendered_frame_time.value(); diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h index 50295ac4c9..1703454efb 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h @@ -209,9 +209,7 @@ class DefaultVideoQualityAnalyzer : public VideoQualityAnalyzerInterface { // If we received frame with id frame_id3, then we will pop frame_id1 and // frame_id2 and consider that frames as dropped and then compare received // frame with the one from |captured_frames_in_flight_| with id frame_id3. - // Also we will put it into the |last_rendered_frame|. std::deque frame_ids; - absl::optional last_rendered_frame = absl::nullopt; absl::optional last_rendered_frame_time = absl::nullopt; };