Deleted renderer-related SetSize methods, and all uses.

talk/media/base/videocapturer_unittest.cc

 /*
  * libjingle
  * Copyright 2008 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 196 matching lines @@
       cricket::VideoFormat::FpsToInterval(5), cricket::FOURCC_ARGB));
   capturer_.ResetSupportedFormats(formats);
 
   EXPECT_EQ(cricket::CS_RUNNING, capturer_.Start(cricket::VideoFormat(
       kWidth,
       kHeight,
       cricket::VideoFormat::FpsToInterval(30),
       cricket::FOURCC_ARGB)));
   EXPECT_TRUE(capturer_.IsRunning());
   EXPECT_EQ(0, renderer_.num_rendered_frames());
-  renderer_.SetSize(kWidth, kHeight, 0);
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(1, renderer_.num_rendered_frames());
+  EXPECT_EQ(kWidth, renderer_.width());
+  EXPECT_EQ(kHeight, renderer_.height());
 }
 
 TEST_F(VideoCapturerTest, TestRotationPending) {
   int kWidth = 800;
   int kHeight = 400;
   int frame_count = 0;
 
   std::vector<cricket::VideoFormat> formats;
   formats.push_back(cricket::VideoFormat(kWidth, kHeight,
                                          cricket::VideoFormat::FpsToInterval(5),
                                          cricket::FOURCC_I420));
 
   capturer_.ResetSupportedFormats(formats);
   // capturer_ should compensate rotation as default.
   capturer_.UpdateAspectRatio(400, 200);
 
   EXPECT_EQ(cricket::CS_RUNNING,
             capturer_.Start(cricket::VideoFormat(
                 kWidth, kHeight, cricket::VideoFormat::FpsToInterval(30),
                 cricket::FOURCC_I420)));
   EXPECT_TRUE(capturer_.IsRunning());
   EXPECT_EQ(0, renderer_.num_rendered_frames());
 
   // If the frame's rotation is compensated anywhere in the pipeline based on
   // the rotation information, the renderer should be given the right dimension
   // such that the frame could be rendered.
 
-  // Swap the dimension for the next 2 frames which are rotated by 90 and 270
-  // degree.
-  renderer_.SetSize(kHeight, kWidth, 0);
-
   capturer_.SetRotation(webrtc::kVideoRotation_90);
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(++frame_count, renderer_.num_rendered_frames());
+  // Swapped width and height
+  EXPECT_EQ(kWidth, renderer_.height());
+  EXPECT_EQ(kHeight, renderer_.width());
 
   capturer_.SetRotation(webrtc::kVideoRotation_270);
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(++frame_count, renderer_.num_rendered_frames());
-
-  // Reset the renderer to have corresponding width and height.
-  renderer_.SetSize(kWidth, kHeight, 0);
+  // Swapped width and height
+  EXPECT_EQ(kWidth, renderer_.height());
+  EXPECT_EQ(kHeight, renderer_.width());
 
   capturer_.SetRotation(webrtc::kVideoRotation_180);
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(++frame_count, renderer_.num_rendered_frames());
+  // Back to normal width and height
+  EXPECT_EQ(kWidth, renderer_.width());
+  EXPECT_EQ(kHeight, renderer_.height());
 }
 
 TEST_F(VideoCapturerTest, TestRotationApplied) {
   int kWidth = 800;
   int kHeight = 400;
 
   std::vector<cricket::VideoFormat> formats;
   formats.push_back(cricket::VideoFormat(kWidth, kHeight,
                                          cricket::VideoFormat::FpsToInterval(5),
                                          cricket::FOURCC_I420));
 
   capturer_.ResetSupportedFormats(formats);
   // capturer_ should not compensate rotation.
   capturer_.SetApplyRotation(false);
   capturer_.UpdateAspectRatio(400, 200);
   set_expected_compensation(false);
 
   EXPECT_EQ(cricket::CS_RUNNING,
             capturer_.Start(cricket::VideoFormat(
                 kWidth, kHeight, cricket::VideoFormat::FpsToInterval(30),
                 cricket::FOURCC_I420)));
   EXPECT_TRUE(capturer_.IsRunning());
   EXPECT_EQ(0, renderer_.num_rendered_frames());
 
-  renderer_.SetSize(kWidth, kHeight, 0);
-
   // If the frame's rotation is compensated anywhere in the pipeline, the frame
   // won't have its original dimension out from capturer. Since the renderer
   // here has the same dimension as the capturer, it will skip that frame as the
   // resolution won't match anymore.
 
   int frame_count = 0;
   capturer_.SetRotation(webrtc::kVideoRotation_0);
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(++frame_count, renderer_.num_rendered_frames());
 
@@ skipping 23 matching lines @@
       cricket::VideoFormat::FpsToInterval(5), cricket::FOURCC_ARGB));
   capturer_.ResetSupportedFormats(formats);
 
   EXPECT_EQ(cricket::CS_RUNNING, capturer_.Start(cricket::VideoFormat(
       kWidth,
       kHeight,
       cricket::VideoFormat::FpsToInterval(30),
       cricket::FOURCC_ARGB)));
   EXPECT_TRUE(capturer_.IsRunning());
   EXPECT_EQ(0, renderer_.num_rendered_frames());
-  renderer_.SetSize(2050, 1538, 0);
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(1, renderer_.num_rendered_frames());
+  EXPECT_EQ(kWidth / 2, renderer_.width());
+  EXPECT_EQ(kHeight / 2, renderer_.height());
 }
 
 TEST_F(VideoCapturerTest, TestFourccMatch) {
   cricket::VideoFormat desired(640, 480,
                                cricket::VideoFormat::FpsToInterval(30),
                                cricket::FOURCC_ANY);
   cricket::VideoFormat best;
   EXPECT_TRUE(capturer_.GetBestCaptureFormat(desired, &best));
   EXPECT_EQ(640, best.width);
   EXPECT_EQ(480, best.height);
@@ skipping 459 matching lines @@
   capturer_.set_enable_camera_list(true);
   capturer_.ConstrainSupportedFormats(vga_format);
   EXPECT_EQ(2u, capturer_.GetSupportedFormats()->size());
   // To make sure it's not just the camera list being broken, add in VGA and
   // try again. This time, only the VGA format should be there.
   supported_formats.push_back(vga_format);
   capturer_.ResetSupportedFormats(supported_formats);
   ASSERT_EQ(1u, capturer_.GetSupportedFormats()->size());
   EXPECT_EQ(vga_format.height, capturer_.GetSupportedFormats()->at(0).height);
 }