Remove cricket::VideoProcessor and AddVideoProcessor() functionality

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 15 matching lines @@
  */
 
 #include <stdio.h>
 #include <vector>
 
 #include "talk/media/base/fakemediaprocessor.h"
 #include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/base/fakevideorenderer.h"
 #include "talk/media/base/testutils.h"
 #include "talk/media/base/videocapturer.h"
-#include "talk/media/base/videoprocessor.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 
 using cricket::FakeVideoCapturer;
 
 namespace {
 
 const int kMsCallbackWait = 500;
 // For HD only the height matters.
 const int kMinHdHeight = 720;
 const uint32 kTimeout = 5000U;
 
 }  // namespace
 
-// Sets the elapsed time in the video frame to 0.
-class VideoProcessor0 : public cricket::VideoProcessor {
- public:
-  virtual void OnFrame(uint32 /*ssrc*/, cricket::VideoFrame* frame,
-                       bool* drop_frame) {
-    frame->SetElapsedTime(0u);
-  }
-};
-
-// Adds one to the video frame's elapsed time. Note that VideoProcessor0 and
-// VideoProcessor1 are not commutative.
-class VideoProcessor1 : public cricket::VideoProcessor {
- public:
-  virtual void OnFrame(uint32 /*ssrc*/, cricket::VideoFrame* frame,
-                       bool* drop_frame) {
-    int64 elapsed_time = frame->GetElapsedTime();
-    frame->SetElapsedTime(elapsed_time + 1);
-  }
-};
-
 class VideoCapturerTest
     : public sigslot::has_slots<>,
       public testing::Test {
  public:
   VideoCapturerTest()
       : capture_state_(cricket::CS_STOPPED),
         num_state_changes_(0),
         video_frames_received_(0),
         last_frame_elapsed_time_(0),
         expects_rotation_applied_(true) {
@@ skipping 717 matching lines @@
   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, video_frames_received());
   EXPECT_TRUE(capturer_.CaptureFrame());
   EXPECT_EQ(1, video_frames_received());
 }
-
-TEST_F(VideoCapturerTest, ProcessorChainTest) {
-  VideoProcessor0 processor0;
-  VideoProcessor1 processor1;
-  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, video_frames_received());
-  // First processor sets elapsed time to 0.
-  capturer_.AddVideoProcessor(&processor0);
-  // Second processor adds 1 to the elapsed time. I.e. a frames elapsed time
-  // should now always be 1 (and not 0).
-  capturer_.AddVideoProcessor(&processor1);
-  EXPECT_TRUE(capturer_.CaptureFrame());
-  EXPECT_EQ(1, video_frames_received());
-  EXPECT_EQ(1u, last_frame_elapsed_time());
-  capturer_.RemoveVideoProcessor(&processor1);
-  EXPECT_TRUE(capturer_.CaptureFrame());
-  // Since processor1 has been removed the elapsed time should now be 0.
-  EXPECT_EQ(2, video_frames_received());
-  EXPECT_EQ(0u, last_frame_elapsed_time());
-}
-
-TEST_F(VideoCapturerTest, ProcessorDropFrame) {
-  cricket::FakeMediaProcessor dropping_processor_;
-  dropping_processor_.set_drop_frames(true);
-  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, video_frames_received());
-  // Install a processor that always drop frames.
-  capturer_.AddVideoProcessor(&dropping_processor_);
-  EXPECT_TRUE(capturer_.CaptureFrame());
-  EXPECT_EQ(0, video_frames_received());
-}
 #endif  // HAVE_WEBRTC_VIDEO
 
 bool HdFormatInList(const std::vector<cricket::VideoFormat>& formats) {
   for (std::vector<cricket::VideoFormat>::const_iterator found =
            formats.begin(); found != formats.end(); ++found) {
     if (found->height >= kMinHdHeight) {
       return true;
     }
   }
   return false;
@@ skipping 46 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);
 }