commit 8e8908aadd23173c654078f69f6a9c8ec4786e2a
author nisse <nisse@webrtc.org> Fri Feb 05 09:52:15 2016
committer Commit bot <commit-bot@chromium.org> Fri Feb 05 09:52:20 2016
tree 925811883831ebe2c4e8ad0b4097b1de1efb97bf
parent 25d1f28fa978f555d9a5a8855712db5a74d6828d

Delete FrameInput method and FrameInputWrapper class.

Added VideoTrackInterface::GetSink method, for use by
VideoRtpReceiver. This lets us delete FrameInput.

I realized this change doesn't depend on VideoSinkInterface changes,
so this is a more standalone version of cl
https://codereview.webrtc.org/1664773002/

BUG=webrtc:5426

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

Cr-Commit-Position: refs/heads/master@{#11498}

talk/app/webrtc/videotrack_unittest.cc

diff --git a/talk/app/webrtc/videotrack_unittest.cc b/talk/app/webrtc/videotrack_unittest.cc
index a205a28..88552a5 100644
--- a/talk/app/webrtc/videotrack_unittest.cc
+++ b/talk/app/webrtc/videotrack_unittest.cc
@@ -77,13 +77,13 @@
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_1(
       new FakeVideoTrackRenderer(video_track_.get()));
 
-  cricket::VideoRenderer* renderer_input =
-      video_track_->GetSource()->FrameInput();
+  rtc::VideoSinkInterface<cricket::VideoFrame>* renderer_input =
+      video_track_->GetSink();
   ASSERT_FALSE(renderer_input == NULL);
 
   cricket::WebRtcVideoFrame frame;
   frame.InitToBlack(123, 123, 0);
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(1, renderer_1->num_rendered_frames());
 
   EXPECT_EQ(123, renderer_1->width());
@@ -93,7 +93,7 @@
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2(
       new FakeVideoTrackRenderer(video_track_.get()));
 
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
 
   EXPECT_EQ(123, renderer_1->width());
   EXPECT_EQ(123, renderer_1->height());
@@ -104,7 +104,7 @@
   EXPECT_EQ(1, renderer_2->num_rendered_frames());
 
   video_track_->RemoveRenderer(renderer_1.get());
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
 
   EXPECT_EQ(2, renderer_1->num_rendered_frames());
   EXPECT_EQ(2, renderer_2->num_rendered_frames());
@@ -115,8 +115,8 @@
   rtc::scoped_ptr<FakeVideoTrackRenderer> renderer(
       new FakeVideoTrackRenderer(video_track_.get()));
 
-  cricket::VideoRenderer* renderer_input =
-      video_track_->GetSource()->FrameInput();
+  rtc::VideoSinkInterface<cricket::VideoFrame>* renderer_input =
+      video_track_->GetSink();
   ASSERT_FALSE(renderer_input == NULL);
 
   cricket::WebRtcVideoFrame frame;
@@ -124,21 +124,21 @@
   // Make it not all-black
   frame.GetUPlane()[0] = 0;
 
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(1, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 
   video_track_->set_enabled(false);
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(2, renderer->num_rendered_frames());
   EXPECT_TRUE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());
   EXPECT_EQ(200, renderer->height());
 
   video_track_->set_enabled(true);
-  renderer_input->RenderFrame(&frame);
+  renderer_input->OnFrame(frame);
   EXPECT_EQ(3, renderer->num_rendered_frames());
   EXPECT_FALSE(renderer->black_frame());
   EXPECT_EQ(100, renderer->width());