| 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 93b98cadefbbb9390e9c2c0bbe1cd0b13b2c857a..8704d97d32667273ca71a42f253272e27d6c2847 100644
|
| --- a/webrtc/video/end_to_end_tests.cc
|
| +++ b/webrtc/video/end_to_end_tests.cc
|
| @@ -211,8 +211,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())
|
| @@ -256,8 +258,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.";
|
| @@ -1301,8 +1304,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();
|
| }
|
|
|
| @@ -1762,8 +1765,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.";
|
|
|