Removed unused cricket::VideoCapturer methods

webrtc/media/base/videocapturer_unittest.cc

 /*
  *  Copyright (c) 2008 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <stdio.h>
 #include <vector>
 
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/media/base/videocapturer.h"
 
 using cricket::FakeVideoCapturer;
 
 namespace {
 
 const int kMsCallbackWait = 500;
 // For HD only the height matters.
 const int kMinHdHeight = 720;
-const uint32_t kTimeout = 5000U;
 
 }  // namespace
 
 class VideoCapturerTest
     : public sigslot::has_slots<>,
       public testing::Test {
  public:
   VideoCapturerTest()
       : capture_state_(cricket::CS_STOPPED), num_state_changes_(0) {
     capturer_.SignalStateChange.connect(this,
@@ skipping 28 matching lines @@
   EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
   EXPECT_EQ(1, num_state_changes());
   capturer_.Stop();
   EXPECT_EQ_WAIT(cricket::CS_STOPPED, capture_state(), kMsCallbackWait);
   EXPECT_EQ(2, num_state_changes());
   capturer_.Stop();
   rtc::Thread::Current()->ProcessMessages(100);
   EXPECT_EQ(2, num_state_changes());
 }
 
-TEST_F(VideoCapturerTest, TestRestart) {
-  EXPECT_EQ(cricket::CS_RUNNING, capturer_.Start(cricket::VideoFormat(
-      640,
-      480,
-      cricket::VideoFormat::FpsToInterval(30),
-      cricket::FOURCC_I420)));
-  EXPECT_TRUE(capturer_.IsRunning());
-  EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
-  EXPECT_EQ(1, num_state_changes());
-  EXPECT_TRUE(capturer_.Restart(cricket::VideoFormat(
-      320,
-      240,
-      cricket::VideoFormat::FpsToInterval(30),
-      cricket::FOURCC_I420)));
-  EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
-  EXPECT_TRUE(capturer_.IsRunning());
-  EXPECT_GE(1, num_state_changes());
-  capturer_.Stop();
-  rtc::Thread::Current()->ProcessMessages(100);
-  EXPECT_FALSE(capturer_.IsRunning());
-}
-
-TEST_F(VideoCapturerTest, TestStartingWithRestart) {
-  EXPECT_FALSE(capturer_.IsRunning());
-  EXPECT_TRUE(capturer_.Restart(cricket::VideoFormat(
-      640,
-      480,
-      cricket::VideoFormat::FpsToInterval(30),
-      cricket::FOURCC_I420)));
-  EXPECT_TRUE(capturer_.IsRunning());
-  EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
-}
-
-TEST_F(VideoCapturerTest, TestRestartWithSameFormat) {
-  cricket::VideoFormat format(640, 480,
-                              cricket::VideoFormat::FpsToInterval(30),
-                              cricket::FOURCC_I420);
-  EXPECT_EQ(cricket::CS_RUNNING, capturer_.Start(format));
-  EXPECT_TRUE(capturer_.IsRunning());
-  EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
-  EXPECT_EQ(1, num_state_changes());
-  EXPECT_TRUE(capturer_.Restart(format));
-  EXPECT_EQ(cricket::CS_RUNNING, capture_state());
-  EXPECT_TRUE(capturer_.IsRunning());
-  EXPECT_EQ(1, num_state_changes());
-}
-
-TEST_F(VideoCapturerTest, CameraOffOnMute) {
-  EXPECT_EQ(cricket::CS_RUNNING, capturer_.Start(cricket::VideoFormat(
-      640,
-      480,
-      cricket::VideoFormat::FpsToInterval(30),
-      cricket::FOURCC_I420)));
-  EXPECT_TRUE(capturer_.IsRunning());
-  EXPECT_EQ(0, renderer_.num_rendered_frames());
-  EXPECT_TRUE(capturer_.CaptureFrame());
-  EXPECT_EQ(1, renderer_.num_rendered_frames());
-  EXPECT_FALSE(capturer_.IsMuted());
-
-  // Mute the camera and expect black output frame.
-  capturer_.MuteToBlackThenPause(true);
-  EXPECT_TRUE(capturer_.IsMuted());
-  for (int i = 0; i < 31; ++i) {
-    EXPECT_TRUE(capturer_.CaptureFrame());
-    EXPECT_TRUE(renderer_.black_frame());
-  }
-  EXPECT_EQ(32, renderer_.num_rendered_frames());
-  EXPECT_EQ_WAIT(cricket::CS_PAUSED,
-                 capturer_.capture_state(), kTimeout);
-
-  // Verify that the camera is off.
-  EXPECT_FALSE(capturer_.CaptureFrame());
-  EXPECT_EQ(32, renderer_.num_rendered_frames());
-
-  // Unmute the camera and expect non-black output frame.
-  capturer_.MuteToBlackThenPause(false);
-  EXPECT_FALSE(capturer_.IsMuted());
-  EXPECT_EQ_WAIT(cricket::CS_RUNNING,
-                 capturer_.capture_state(), kTimeout);
-  EXPECT_TRUE(capturer_.CaptureFrame());
-  EXPECT_FALSE(renderer_.black_frame());
-  EXPECT_EQ(33, renderer_.num_rendered_frames());
-}
-
 TEST_F(VideoCapturerTest, ScreencastScaledOddWidth) {
   capturer_.SetScreencast(true);
 
   int kWidth = 1281;
   int kHeight = 720;
 
   std::vector<cricket::VideoFormat> formats;
   formats.push_back(cricket::VideoFormat(kWidth, kHeight,
       cricket::VideoFormat::FpsToInterval(5), cricket::FOURCC_ARGB));
   capturer_.ResetSupportedFormats(formats);
@@ skipping 17 matching lines @@
   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.
@@ skipping 31 matching lines @@
   formats.push_back(cricket::VideoFormat(kWidth, kHeight,
                                          cricket::VideoFormat::FpsToInterval(5),
                                          cricket::FOURCC_I420));
 
   capturer_.ResetSupportedFormats(formats);
   rtc::VideoSinkWants wants;
   // capturer_ should not compensate rotation.
   wants.rotation_applied = false;
   capturer_.AddOrUpdateSink(&renderer_, wants);
 
-  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, 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
@@ skipping 29 matching lines @@
   formats.push_back(cricket::VideoFormat(kWidth, kHeight,
                                          cricket::VideoFormat::FpsToInterval(5),
                                          cricket::FOURCC_I420));
 
   capturer_.ResetSupportedFormats(formats);
   rtc::VideoSinkWants wants;
   // capturer_ should not compensate rotation.
   wants.rotation_applied = false;
   capturer_.AddOrUpdateSink(&renderer_, wants);
 
-  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());
 
   int frame_count = 0;
   capturer_.SetRotation(webrtc::kVideoRotation_90);
   EXPECT_TRUE(capturer_.CaptureFrame());
@@ skipping 489 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);
 }