diff --git a/test/pc/e2e/analyzer/video/example_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/example_video_quality_analyzer.cc index 2937bcb188..00c0a5b718 100644 --- a/test/pc/e2e/analyzer/video/example_video_quality_analyzer.cc +++ b/test/pc/e2e/analyzer/video/example_video_quality_analyzer.cc @@ -44,16 +44,13 @@ uint16_t ExampleVideoQualityAnalyzer::OnFrameCaptured( } void ExampleVideoQualityAnalyzer::OnFramePreEncode( - const webrtc::VideoFrame& frame) { - rtc::CritScope crit(&lock_); - ++frames_pre_encoded_; -} + const webrtc::VideoFrame& frame) {} void ExampleVideoQualityAnalyzer::OnFrameEncoded( uint16_t frame_id, const webrtc::EncodedImage& encoded_image) { rtc::CritScope crit(&lock_); - ++frames_encoded_; + ++frames_sent_; } void ExampleVideoQualityAnalyzer::OnFrameDropped( @@ -73,10 +70,7 @@ void ExampleVideoQualityAnalyzer::OnFrameReceived( void ExampleVideoQualityAnalyzer::OnFrameDecoded( const webrtc::VideoFrame& frame, absl::optional decode_time_ms, - absl::optional qp) { - rtc::CritScope crit(&lock_); - ++frames_decoded_; -} + absl::optional qp) {} void ExampleVideoQualityAnalyzer::OnFrameRendered( const webrtc::VideoFrame& frame) { @@ -118,14 +112,9 @@ uint64_t ExampleVideoQualityAnalyzer::frames_captured() const { return frames_captured_; } -uint64_t ExampleVideoQualityAnalyzer::frames_pre_encoded() const { +uint64_t ExampleVideoQualityAnalyzer::frames_sent() const { rtc::CritScope crit(&lock_); - return frames_pre_encoded_; -} - -uint64_t ExampleVideoQualityAnalyzer::frames_encoded() const { - rtc::CritScope crit(&lock_); - return frames_encoded_; + return frames_sent_; } uint64_t ExampleVideoQualityAnalyzer::frames_received() const { @@ -133,9 +122,9 @@ uint64_t ExampleVideoQualityAnalyzer::frames_received() const { return frames_received_; } -uint64_t ExampleVideoQualityAnalyzer::frames_decoded() const { +uint64_t ExampleVideoQualityAnalyzer::frames_dropped() const { rtc::CritScope crit(&lock_); - return frames_decoded_; + return frames_dropped_; } uint64_t ExampleVideoQualityAnalyzer::frames_rendered() const { @@ -143,10 +132,5 @@ uint64_t ExampleVideoQualityAnalyzer::frames_rendered() const { return frames_rendered_; } -uint64_t ExampleVideoQualityAnalyzer::frames_dropped() const { - rtc::CritScope crit(&lock_); - return frames_dropped_; -} - } // namespace test } // namespace webrtc diff --git a/test/pc/e2e/analyzer/video/example_video_quality_analyzer.h b/test/pc/e2e/analyzer/video/example_video_quality_analyzer.h index 7e96d4c218..e8a2fa4ebb 100644 --- a/test/pc/e2e/analyzer/video/example_video_quality_analyzer.h +++ b/test/pc/e2e/analyzer/video/example_video_quality_analyzer.h @@ -52,12 +52,10 @@ class ExampleVideoQualityAnalyzer : public VideoQualityAnalyzerInterface { std::string GetStreamLabel(uint16_t frame_id) override; uint64_t frames_captured() const; - uint64_t frames_pre_encoded() const; - uint64_t frames_encoded() const; + uint64_t frames_sent() const; uint64_t frames_received() const; - uint64_t frames_decoded() const; - uint64_t frames_rendered() const; uint64_t frames_dropped() const; + uint64_t frames_rendered() const; private: // When peer A captured the frame it will come into analyzer's OnFrameCaptured @@ -73,12 +71,10 @@ class ExampleVideoQualityAnalyzer : public VideoQualityAnalyzerInterface { std::map frames_to_stream_label_ RTC_GUARDED_BY(lock_); uint16_t next_frame_id_ RTC_GUARDED_BY(lock_) = 0; uint64_t frames_captured_ RTC_GUARDED_BY(lock_) = 0; - uint64_t frames_pre_encoded_ RTC_GUARDED_BY(lock_) = 0; - uint64_t frames_encoded_ RTC_GUARDED_BY(lock_) = 0; + uint64_t frames_sent_ RTC_GUARDED_BY(lock_) = 0; uint64_t frames_received_ RTC_GUARDED_BY(lock_) = 0; - uint64_t frames_decoded_ RTC_GUARDED_BY(lock_) = 0; - uint64_t frames_rendered_ RTC_GUARDED_BY(lock_) = 0; uint64_t frames_dropped_ RTC_GUARDED_BY(lock_) = 0; + uint64_t frames_rendered_ RTC_GUARDED_BY(lock_) = 0; }; } // namespace test