zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vie_encoder_unittest.cc.

Browse Source 
This was broken in https://codereview.webrtc.org/2338133003/ Let ViEEncoder tell VideoSendStream about reconfigurations when I manually landed that cl without rebasing.
Shame on me.

BUG=webrtc:5687, webrtc:6371
TBR=mflodman@webrtc.org
NOTREECHECKS=true

Review URL: https://codereview.webrtc.org/2359153004 .

Cr-Commit-Position: refs/heads/master@{#14373}
This commit is contained in:
Per
2016-09-23 16:24:55 +02:00
parent 44428a8aa6
commit f8c5f2b485
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video/vie_encoder_unittest.cc
View File

@ -282,7 +282,7 @@ TEST_F(ViEEncoderTest, ConfigureEncoderTriggersOnEncoderConfigurationChanged) {
vie_encoder_->OnBitrateUpdated(kTargetBitrateBps, 0, 0);
// Capture a frame and wait for it to synchronize with the encoder thread.
vie_encoder_->IncomingCapturedFrame(CreateFrame(1, nullptr));
video_source_.IncomingCapturedFrame(CreateFrame(1, nullptr));
sink_.WaitForEncodedFrame(1);
EXPECT_EQ(1, sink_.number_of_reconfigurations());
@ -292,7 +292,7 @@ TEST_F(ViEEncoderTest, ConfigureEncoderTriggersOnEncoderConfigurationChanged) {
vie_encoder_->ConfigureEncoder(std::move(video_encoder_config), 1440);
// Capture a frame and wait for it to synchronize with the encoder thread.
vie_encoder_->IncomingCapturedFrame(CreateFrame(2, nullptr));
video_source_.IncomingCapturedFrame(CreateFrame(2, nullptr));
sink_.WaitForEncodedFrame(2);
EXPECT_EQ(2, sink_.number_of_reconfigurations());
EXPECT_EQ(9999, sink_.last_min_transmit_bitrate());