commit 369111bf30e5cb22c1ded18be493618c99680a6b
author Markus Handell <handellm@webrtc.org> Sat Nov 11 09:08:05 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Nov 11 10:52:57 2023
tree 4bccd50e16d7549b13f68589d6c87651b050cd8c
parent 93ec8048b2817b64ebfb2aea1fa86b88a72c5827

Revert "VideoStreamEncoder: exclude screencast from capture time measurement."

This reverts commit 03bc3a0fa67e274efb4518da005f4c5b77c607e9.

Reason for revert: measurement complete

Original change's description:
> VideoStreamEncoder: exclude screencast from capture time measurement.
>
> This CL avoids measurement for screencast encoding work. The reason is
> screencast can cling on to and re-encode old video frames for which
> webrtc::VideoFrame::reference_time() is unchanged.
>
> Bug: chromium:1498378
> Change-Id: I5bf79d29ef7f57ddff2622cbb6c3436480bd16ba
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/326103
> Commit-Queue: Markus Handell <handellm@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Auto-Submit: Markus Handell <handellm@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41097}

Bug: chromium:1498378
Change-Id: I42c1a86123eb1d6c7ad7c8981769f5560884a2f5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/327025
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41133}

video/video_stream_encoder.cc

diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index a5711c1..c9bd604 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -2065,11 +2065,8 @@
 
   frame_encode_metadata_writer_.OnEncodeStarted(out_frame);
 
-  if (encoder_config_.content_type !=
-      VideoEncoderConfig::ContentType::kScreen) {
-    CaptureProcessingDurationMeasurement::AttachToCurrentVoucher(
-        out_frame.reference_time().value_or(clock_->CurrentTime()));
-  }
+  CaptureProcessingDurationMeasurement::AttachToCurrentVoucher(
+      out_frame.reference_time().value_or(clock_->CurrentTime()));
 
   const int32_t encode_status = encoder_->Encode(out_frame, &next_frame_types_);
   was_encode_called_since_last_initialization_ = true;