Merge M93: Condition frame pacing on min/max playout delay

As a first step we only want to enable frame pacing for the case where min playout delay == 0 and max playout delay > 0. (cherry picked from commit b2745ba) Bug: chromium:1237402, chromium:1239469 Change-Id: Icf9641db7566083d0279135efa8618e435d881eb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/228640 Commit-Queue: Johannes Kron <[email protected]> Reviewed-by: Ilya Nikolaevskiy <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#34752} Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/229021 Cr-Commit-Position: refs/branch-heads/4577@{#7} Cr-Branched-From: 5196931-refs/heads/master@{#34463}
webrtc-sdk · Aug 17, 2021 · 852bc24 · 852bc24
1 parent cb0768c
commit 852bc24
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/video_coding/timing.cc b/modules/video_coding/timing.cc
@@ -214,7 +214,8 @@ int64_t VCMTiming::MaxWaitingTime(int64_t render_time_ms,
                                   bool too_many_frames_queued) const {
   MutexLock lock(&mutex_);
 
-  if (render_time_ms == 0 && zero_playout_delay_min_pacing_->us() > 0) {
+  if (render_time_ms == 0 && zero_playout_delay_min_pacing_->us() > 0 &&
+      min_playout_delay_ms_ == 0 && max_playout_delay_ms_ > 0) {
     // |render_time_ms| == 0 indicates that the frame should be decoded and
     // rendered as soon as possible. However, the decoder can be choked if too
     // many frames are sent at once. Therefore, limit the interframe delay to