Index: webrtc/video/end_to_end_tests.cc |
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc |
index 55d5cc073d045d4499c0d1f2681c499bf9ed620f..2f7b7463a041ff82f6e5c3b8a4de69443b469903 100644 |
--- a/webrtc/video/end_to_end_tests.cc |
+++ b/webrtc/video/end_to_end_tests.cc |
@@ -214,8 +214,10 @@ TEST_F(EndToEndTest, RendersSingleDelayedFrame) { |
// check that the callbacks are done after processing video. |
std::unique_ptr<test::FrameGenerator> frame_generator( |
test::FrameGenerator::CreateChromaGenerator(kWidth, kHeight)); |
- video_send_stream_->Input()->IncomingCapturedFrame( |
- *frame_generator->NextFrame()); |
+ test::FrameForwarder frame_forwarder; |
+ video_send_stream_->SetSource(&frame_forwarder); |
+ |
+ frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); |
EXPECT_TRUE(pre_render_callback.Wait()) |
<< "Timed out while waiting for pre-render callback."; |
EXPECT_TRUE(renderer.Wait()) |
@@ -259,8 +261,9 @@ TEST_F(EndToEndTest, TransmitsFirstFrame) { |
test::FrameGenerator::CreateChromaGenerator( |
video_encoder_config_.streams[0].width, |
video_encoder_config_.streams[0].height)); |
- video_send_stream_->Input()->IncomingCapturedFrame( |
- *frame_generator->NextFrame()); |
+ test::FrameForwarder frame_forwarder; |
+ video_send_stream_->SetSource(&frame_forwarder); |
+ frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); |
EXPECT_TRUE(renderer.Wait()) |
<< "Timed out while waiting for the frame to render."; |
@@ -1304,8 +1307,8 @@ class MultiStreamTest { |
receive_streams[i]->Start(); |
frame_generators[i] = test::FrameGeneratorCapturer::Create( |
- send_streams[i]->Input(), width, height, 30, |
- Clock::GetRealTimeClock()); |
+ width, height, 30, Clock::GetRealTimeClock()); |
+ send_streams[i]->SetSource(frame_generators[i]); |
frame_generators[i]->Start(); |
} |
@@ -1765,8 +1768,9 @@ TEST_F(EndToEndTest, ObserversEncodedFrames) { |
test::FrameGenerator::CreateChromaGenerator( |
video_encoder_config_.streams[0].width, |
video_encoder_config_.streams[0].height)); |
- video_send_stream_->Input()->IncomingCapturedFrame( |
- *frame_generator->NextFrame()); |
+ test::FrameForwarder forwarder; |
+ video_send_stream_->SetSource(&forwarder); |
+ forwarder.IncomingCapturedFrame(*frame_generator->NextFrame()); |
EXPECT_TRUE(post_encode_observer.Wait()) |
<< "Timed out while waiting for send-side encoded-frame callback."; |