Remove cricket::VideoProcessor and AddVideoProcessor() functionality

talk/media/base/capturemanager_unittest.cc

 /*
  * libjingle
  * Copyright 2012 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 45 matching lines @@
         this,
         &CaptureManagerTest::OnCapturerStateChange);
   }
   void PopulateSupportedFormats() {
     std::vector<cricket::VideoFormat> formats;
     for (int i = 0; i < ARRAY_SIZE(kCameraFormats); ++i) {
       formats.push_back(cricket::VideoFormat(kCameraFormats[i]));
     }
     video_capturer_.ResetSupportedFormats(formats);
   }
-  int NumFramesProcessed() { return media_processor_.video_frame_count(); }
   int NumFramesRendered() { return video_renderer_.num_rendered_frames(); }
   bool WasRenderedResolution(cricket::VideoFormat format) {
     return format.width == video_renderer_.width() &&
         format.height == video_renderer_.height();
   }
   cricket::CaptureState capture_state() { return capture_state_; }
   int callback_count() { return callback_count_; }
   void OnCapturerStateChange(cricket::VideoCapturer* capturer,
                              cricket::CaptureState capture_state) {
     capture_state_ = capture_state;
@@ skipping 11 matching lines @@
   int callback_count_;
   cricket::VideoFormat format_vga_;
   cricket::VideoFormat format_qvga_;
 };
 
 // Incorrect use cases.
 TEST_F(CaptureManagerTest, InvalidCallOrder) {
   // Capturer must be registered before any of these calls.
   EXPECT_FALSE(capture_manager_.AddVideoRenderer(&video_capturer_,
                                                  &video_renderer_));
-  EXPECT_FALSE(capture_manager_.AddVideoProcessor(&video_capturer_,
-                                                  &media_processor_));
 }
 
 TEST_F(CaptureManagerTest, InvalidAddingRemoving) {
   EXPECT_FALSE(capture_manager_.StopVideoCapture(&video_capturer_,
                                                  cricket::VideoFormat()));
   EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
                                                  format_vga_));
   EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
   EXPECT_EQ(1, callback_count());
   EXPECT_FALSE(capture_manager_.AddVideoRenderer(&video_capturer_, NULL));
   EXPECT_FALSE(capture_manager_.RemoveVideoRenderer(&video_capturer_,
                                                     &video_renderer_));
-  EXPECT_FALSE(capture_manager_.AddVideoProcessor(&video_capturer_,
-                                                  NULL));
-  EXPECT_FALSE(capture_manager_.RemoveVideoProcessor(&video_capturer_,
-                                                     &media_processor_));
   EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_, format_vga_));
 }
 
 // Valid use cases
-TEST_F(CaptureManagerTest, ProcessorTest) {
-  EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
-                                                 format_vga_));
-  EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
-  EXPECT_EQ(1, callback_count());
-  EXPECT_TRUE(capture_manager_.AddVideoRenderer(&video_capturer_,
-                                                &video_renderer_));
-  EXPECT_TRUE(capture_manager_.AddVideoProcessor(&video_capturer_,
-                                                 &media_processor_));
-  EXPECT_TRUE(video_capturer_.CaptureFrame());
-  EXPECT_EQ(1, NumFramesProcessed());
-  EXPECT_EQ(1, NumFramesRendered());
-  EXPECT_TRUE(capture_manager_.RemoveVideoProcessor(&video_capturer_,
-                                                    &media_processor_));
-  // Processor has been removed so no more frames should be processed.
-  EXPECT_TRUE(video_capturer_.CaptureFrame());
-  EXPECT_EQ(1, NumFramesProcessed());
-  EXPECT_EQ(2, NumFramesRendered());
-  EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_, format_vga_));
-  EXPECT_EQ(2, callback_count());
-}
-
 TEST_F(CaptureManagerTest, KeepFirstResolutionHigh) {
   EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,
                                                  format_vga_));
   EXPECT_EQ_WAIT(cricket::CS_RUNNING, capture_state(), kMsCallbackWait);
   EXPECT_EQ(1, callback_count());
   EXPECT_TRUE(capture_manager_.AddVideoRenderer(&video_capturer_,
                                                 &video_renderer_));
   EXPECT_TRUE(video_capturer_.CaptureFrame());
   EXPECT_EQ(1, NumFramesRendered());
   // Renderer should be fed frames with the resolution of format_vga_.
@@ skipping 98 matching lines @@
   // Now request restart with qvga.
   EXPECT_TRUE(capture_manager_.RestartVideoCapture(
       &video_capturer_, format_vga_, format_qvga_,
       cricket::CaptureManager::kRequestRestart));
   EXPECT_TRUE(video_capturer_.CaptureFrame());
   EXPECT_EQ(2, NumFramesRendered());
   EXPECT_TRUE(WasRenderedResolution(format_vga_));
   EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_,
                                                 format_qvga_));
 }