Unflake VideoStreamEncoderTest.StatsTracksCpuAdaptationStatsWhenSwitchingSource_Balanced

R=hbos@webrtc.org

Bug: webrtc:11603
Change-Id: I6644f96cf1ec22ceb268349f0f325d73082a0148
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175917
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@google.com>
Cr-Commit-Position: refs/heads/master@{#31350}
This commit is contained in:
Evan Shrubsole 2020-05-25 16:54:21 +02:00 committed by Commit Bot
parent 621c33653f
commit de2049e85a

View File

@ -2461,7 +2461,7 @@ TEST_F(VideoStreamEncoderTest,
// Set new degradation preference should clear restrictions since we changed
// from BALANCED.
video_stream_encoder_->SetSource(
video_stream_encoder_->SetSourceAndWaitForRestrictionsUpdated(
&source, webrtc::DegradationPreference::MAINTAIN_FRAMERATE);
source.IncomingCapturedFrame(CreateFrame(sequence, kWidth, kHeight));
WaitForEncodedFrame(sequence++);
@ -2485,8 +2485,8 @@ TEST_F(VideoStreamEncoderTest,
EXPECT_EQ(2, stats.number_of_cpu_adapt_changes);
// Back to BALANCED, should clear the restrictions again.
video_stream_encoder_->SetSource(&source,
webrtc::DegradationPreference::BALANCED);
video_stream_encoder_->SetSourceAndWaitForRestrictionsUpdated(
&source, webrtc::DegradationPreference::BALANCED);
source.IncomingCapturedFrame(CreateFrame(sequence, kWidth, kHeight));
WaitForEncodedFrame(sequence++);
stats = stats_proxy_->GetStats();