Move VCMTiming::kDefaultRenderDelay to anonymous namespace in .cc file. It is used in the implementation only. Bug: b/493549134 Change-Id: Ib309296b0b5ecc32f84da4cf8cfc3e642d915c94 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/458721 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47229}
diff --git a/modules/video_coding/timing/timing.cc b/modules/video_coding/timing/timing.cc index a947b38..63a7bef 100644 --- a/modules/video_coding/timing/timing.cc +++ b/modules/video_coding/timing/timing.cc
@@ -31,6 +31,7 @@ namespace webrtc { namespace { +constexpr TimeDelta kDefaultRenderDelay = TimeDelta::Millis(10); // Default pacing that is used for the low-latency renderer path. constexpr TimeDelta kZeroPlayoutDelayDefaultMinPacing = TimeDelta::Millis(8); constexpr TimeDelta kLowLatencyStreamMaxPlayoutDelayThreshold =
diff --git a/modules/video_coding/timing/timing.h b/modules/video_coding/timing/timing.h index 2ccf154..d0b8638 100644 --- a/modules/video_coding/timing/timing.h +++ b/modules/video_coding/timing/timing.h
@@ -56,26 +56,24 @@ TimeDelta current_delay; }; - static constexpr TimeDelta kDefaultRenderDelay = TimeDelta::Millis(10); - VCMTiming(Clock* clock, const FieldTrialsView& field_trials); virtual ~VCMTiming() = default; // Resets the timing to the initial state. void Reset(); - // Set the amount of time needed to render an image. Defaults to 10 ms. + // Sets the amount of time needed to render an image. Defaults to 10 ms. void set_render_delay(TimeDelta render_delay); - // Set the minimum time the video must be delayed on the receiver to + // Sets the minimum time the video must be delayed on the receiver to // get the desired jitter buffer level. void SetJitterDelay(TimeDelta required_delay); - // Set/get the minimum playout delay from capture to render. + // Sets/gets the minimum playout delay from capture to render. TimeDelta min_playout_delay() const; void set_min_playout_delay(TimeDelta min_playout_delay); - // Set the minimum and maximum playout delay from capture to render. + // Sets the minimum and maximum playout delay from capture to render. void set_playout_delay(const VideoPlayoutDelay& playout_delay); // Increases or decreases the current delay to get closer to the target delay. @@ -113,7 +111,7 @@ // render delay. TimeDelta TargetVideoDelay() const; - // Return current timing information. + // Returns current timing information. VideoDelayTimings GetTimings() const; void SetTimingFrameInfo(const TimingFrameInfo& info);
diff --git a/modules/video_coding/timing/timing_unittest.cc b/modules/video_coding/timing/timing_unittest.cc index 45b26ab..afe11d0 100644 --- a/modules/video_coding/timing/timing_unittest.cc +++ b/modules/video_coding/timing/timing_unittest.cc
@@ -397,7 +397,8 @@ SimulatedClock clock(Timestamp::Millis(33)); VCMTiming timing(&clock, field_trials); - timing.set_render_delay(TimeDelta::Millis(11)); + const TimeDelta default_render_delay = timing.GetTimings().render_delay; + timing.set_render_delay(default_render_delay + TimeDelta::Millis(1)); TimeDelta min_playout_delay = TimeDelta::Millis(50); TimeDelta max_playout_delay = TimeDelta::Millis(500); timing.set_playout_delay({min_playout_delay, max_playout_delay}); @@ -419,7 +420,7 @@ EXPECT_GT(timings.num_decoded_frames, 0u); EXPECT_EQ(timings.minimum_delay, TimeDelta::Zero()); EXPECT_EQ(timings.estimated_max_decode_time, TimeDelta::Zero()); - EXPECT_EQ(timings.render_delay, VCMTiming::kDefaultRenderDelay); + EXPECT_EQ(timings.render_delay, default_render_delay); EXPECT_EQ(timings.min_playout_delay, TimeDelta::Zero()); EXPECT_EQ(timings.max_playout_delay, max_playout_delay); EXPECT_EQ(timings.target_delay, TimeDelta::Zero());