| Index: talk/app/webrtc/videotrack_unittest.cc
|
| diff --git a/talk/app/webrtc/videotrack_unittest.cc b/talk/app/webrtc/videotrack_unittest.cc
|
| index 529866d5f8dd47d5f54ea5942819d8f109e95b89..324a88ba4ccfaa1f8a7a2189c7dbd4cffac17175 100644
|
| --- a/talk/app/webrtc/videotrack_unittest.cc
|
| +++ b/talk/app/webrtc/videotrack_unittest.cc
|
| @@ -111,64 +111,3 @@ TEST_F(VideoTrackTest, RenderVideo) {
|
| EXPECT_EQ(2, renderer_1->num_rendered_frames());
|
| EXPECT_EQ(2, renderer_2->num_rendered_frames());
|
| }
|
| -
|
| -// Test adding renderers which support and don't support rotation and receive
|
| -// the right frame.
|
| -TEST_F(VideoTrackTest, RenderVideoWithPendingRotation) {
|
| - const size_t kWidth = 800;
|
| - const size_t kHeight = 400;
|
| -
|
| - // Add a renderer which supports rotation.
|
| - rtc::scoped_ptr<FakeVideoTrackRenderer> rotating_renderer(
|
| - new FakeVideoTrackRenderer(video_track_.get(), true));
|
| -
|
| - cricket::VideoRenderer* renderer_input =
|
| - video_track_->GetSource()->FrameInput();
|
| - ASSERT_FALSE(renderer_input == NULL);
|
| -
|
| - // Create a frame with rotation 90 degree.
|
| - WebRtcVideoTestFrame frame;
|
| - frame.InitToBlack(kWidth, kHeight, 1, 1, 0, 0);
|
| - frame.SetRotation(webrtc::kVideoRotation_90);
|
| -
|
| - // rotating_renderer should see the frame unrotated.
|
| - renderer_input->RenderFrame(&frame);
|
| - EXPECT_EQ(1, rotating_renderer->num_rendered_frames());
|
| - EXPECT_EQ(kWidth, rotating_renderer->width());
|
| - EXPECT_EQ(kHeight, rotating_renderer->height());
|
| - EXPECT_EQ(&frame, rotating_renderer->last_frame());
|
| -
|
| - // Add 2nd renderer which doesn't support rotation.
|
| - rtc::scoped_ptr<FakeVideoTrackRenderer> non_rotating_renderer(
|
| - new FakeVideoTrackRenderer(video_track_.get(), false));
|
| -
|
| - // Render the same 90 degree frame.
|
| - renderer_input->RenderFrame(&frame);
|
| -
|
| - // rotating_renderer should see the same frame.
|
| - EXPECT_EQ(kWidth, rotating_renderer->width());
|
| - EXPECT_EQ(kHeight, rotating_renderer->height());
|
| - EXPECT_EQ(&frame, rotating_renderer->last_frame());
|
| -
|
| - // non_rotating_renderer should see the frame rotated.
|
| - EXPECT_EQ(kHeight, non_rotating_renderer->width());
|
| - EXPECT_EQ(kWidth, non_rotating_renderer->height());
|
| - EXPECT_NE(&frame, non_rotating_renderer->last_frame());
|
| -
|
| - // Render the same 90 degree frame the 3rd time.
|
| - renderer_input->RenderFrame(&frame);
|
| -
|
| - // Now render a frame without rotation.
|
| - frame.SetRotation(webrtc::kVideoRotation_0);
|
| - renderer_input->RenderFrame(&frame);
|
| -
|
| - // rotating_renderer should still only have 1 setsize.
|
| - EXPECT_EQ(kWidth, rotating_renderer->width());
|
| - EXPECT_EQ(kHeight, rotating_renderer->height());
|
| - EXPECT_EQ(&frame, rotating_renderer->last_frame());
|
| -
|
| - // render_2 should have a new size but should have the same frame.
|
| - EXPECT_EQ(kWidth, non_rotating_renderer->width());
|
| - EXPECT_EQ(kHeight, non_rotating_renderer->height());
|
| - EXPECT_EQ(&frame, non_rotating_renderer->last_frame());
|
| -}
|
|
|