From f8c5f2b485a2060ea068c9eada006edaa8700fe6 Mon Sep 17 00:00:00 2001 From: Per Date: Fri, 23 Sep 2016 16:24:55 +0200 Subject: [PATCH] Fix vie_encoder_unittest.cc. 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} --- webrtc/video/vie_encoder_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc index 8c43fe5740..1ab6e681e6 100644 --- a/webrtc/video/vie_encoder_unittest.cc +++ b/webrtc/video/vie_encoder_unittest.cc @@ -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());