Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/modules/video_capture/test/video_capture_unittest.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 11 matching lines @@
 #include "webrtc/modules/video_capture/video_capture_factory.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/frame_utils.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/video_frame.h"
 
 using webrtc::CriticalSectionWrapper;
 using webrtc::CriticalSectionScoped;
 using webrtc::SleepMs;
-using webrtc::VideoCaptureAlarm;
 using webrtc::VideoCaptureCapability;
-using webrtc::VideoCaptureDataCallback;
 using webrtc::VideoCaptureFactory;
-using webrtc::VideoCaptureFeedBack;
 using webrtc::VideoCaptureModule;
 
 
 #define WAIT_(ex, timeout, res) \
   do { \
     res = (ex); \
     int64_t start = rtc::TimeMillis(); \
     while (!res && rtc::TimeMillis() < start + timeout) { \
       SleepMs(5); \
       res = (ex); \
     } \
   } while (0)
 
 #define EXPECT_TRUE_WAIT(ex, timeout) \
   do { \
     bool res; \
     WAIT_(ex, timeout, res); \
     if (!res) EXPECT_TRUE(ex); \
   } while (0)
 
 
 static const int kTimeOut = 5000;
 static const int kTestHeight = 288;
 static const int kTestWidth = 352;
 static const int kTestFramerate = 30;
 
-class TestVideoCaptureCallback : public VideoCaptureDataCallback {
+class TestVideoCaptureCallback
+    : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
  public:
   TestVideoCaptureCallback()
       : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
-        capture_delay_(-1),
         last_render_time_ms_(0),
         incoming_frames_(0),
         timing_warnings_(0),
         rotate_frame_(webrtc::kVideoRotation_0) {}
 
   ~TestVideoCaptureCallback() {
     if (timing_warnings_ > 0)
       printf("No of timing warnings %d\n", timing_warnings_);
   }
 
-  virtual void OnIncomingCapturedFrame(const int32_t id,
-                                       const webrtc::VideoFrame& videoFrame) {
+  void OnFrame(const webrtc::VideoFrame& videoFrame) override {
     CriticalSectionScoped cs(capture_cs_.get());
     int height = videoFrame.height();
     int width = videoFrame.width();
 #if defined(ANDROID) && ANDROID
     // Android camera frames may be rotated depending on test device
     // orientation.
     EXPECT_TRUE(height == capability_.height || height == capability_.width);
     EXPECT_TRUE(width == capability_.width || width == capability_.height);
 #else
     EXPECT_EQ(height, capability_.height);
@@ skipping 12 matching lines @@
             last_render_time_ms_ + (1000 * 0.9) / capability_.maxFPS &&
             last_render_time_ms_ > 0)) {
       timing_warnings_++;
     }
 
     incoming_frames_++;
     last_render_time_ms_ = videoFrame.render_time_ms();
     last_frame_ = videoFrame.video_frame_buffer();
   }
 
-  virtual void OnCaptureDelayChanged(const int32_t id,
-                                     const int32_t delay) {
-    CriticalSectionScoped cs(capture_cs_.get());
-    capture_delay_ = delay;
-  }
-
   void SetExpectedCapability(VideoCaptureCapability capability) {
     CriticalSectionScoped cs(capture_cs_.get());
     capability_= capability;
     incoming_frames_ = 0;
     last_render_time_ms_ = 0;
-    capture_delay_ = -1;
   }
   int incoming_frames() {
     CriticalSectionScoped cs(capture_cs_.get());
     return incoming_frames_;
   }
 
-  int capture_delay() {
-    CriticalSectionScoped cs(capture_cs_.get());
-    return capture_delay_;
-  }
   int timing_warnings() {
     CriticalSectionScoped cs(capture_cs_.get());
     return timing_warnings_;
   }
   VideoCaptureCapability capability() {
     CriticalSectionScoped cs(capture_cs_.get());
     return capability_;
   }
 
   bool CompareLastFrame(const webrtc::VideoFrame& frame) {
     CriticalSectionScoped cs(capture_cs_.get());
     return webrtc::test::FrameBufsEqual(last_frame_,
                                         frame.video_frame_buffer());
   }
 
   void SetExpectedCaptureRotation(webrtc::VideoRotation rotation) {
     CriticalSectionScoped cs(capture_cs_.get());
     rotate_frame_ = rotation;
   }
 
  private:
   std::unique_ptr<CriticalSectionWrapper> capture_cs_;
   VideoCaptureCapability capability_;
-  int capture_delay_;
   int64_t last_render_time_ms_;
   int incoming_frames_;
   int timing_warnings_;
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> last_frame_;
   webrtc::VideoRotation rotate_frame_;
 };
 
-class TestVideoCaptureFeedBack : public VideoCaptureFeedBack {
- public:
-  TestVideoCaptureFeedBack() :
-    capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
-    frame_rate_(0),
-    alarm_(webrtc::Cleared) {
-  }
-
-  virtual void OnCaptureFrameRate(const int32_t id,
-                                  const uint32_t frameRate) {
-    CriticalSectionScoped cs(capture_cs_.get());
-    frame_rate_ = frameRate;
-  }
-
-  virtual void OnNoPictureAlarm(const int32_t id,
-                                const VideoCaptureAlarm reported_alarm) {
-    CriticalSectionScoped cs(capture_cs_.get());
-    alarm_ = reported_alarm;
-  }
-  int frame_rate() {
-    CriticalSectionScoped cs(capture_cs_.get());
-    return frame_rate_;
-
-  }
-  VideoCaptureAlarm alarm() {
-    CriticalSectionScoped cs(capture_cs_.get());
-    return alarm_;
-  }
-
- private:
-  std::unique_ptr<CriticalSectionWrapper> capture_cs_;
-  unsigned int frame_rate_;
-  VideoCaptureAlarm alarm_;
-};
-
 class VideoCaptureTest : public testing::Test {
  public:
   VideoCaptureTest() : number_of_devices_(0) {}
 
   void SetUp() {
-    device_info_.reset(VideoCaptureFactory::CreateDeviceInfo(0));
+    device_info_.reset(VideoCaptureFactory::CreateDeviceInfo());
     assert(device_info_.get());
     number_of_devices_ = device_info_->NumberOfDevices();
     ASSERT_GT(number_of_devices_, 0u);
   }
 
   rtc::scoped_refptr<VideoCaptureModule> OpenVideoCaptureDevice(
       unsigned int device,
-      VideoCaptureDataCallback* callback) {
+      rtc::VideoSinkInterface<webrtc::VideoFrame>* callback) {
     char device_name[256];
     char unique_name[256];
 
     EXPECT_EQ(0, device_info_->GetDeviceName(
         device, device_name, 256, unique_name, 256));
 
     rtc::scoped_refptr<VideoCaptureModule> module(
-        VideoCaptureFactory::Create(device, unique_name));
+        VideoCaptureFactory::Create(unique_name));
     if (module.get() == NULL)
       return NULL;
 
     EXPECT_FALSE(module->CaptureStarted());
 
-    module->RegisterCaptureDataCallback(*callback);
+    module->RegisterCaptureDataCallback(callback);
     return module;
   }
 
   void StartCapture(VideoCaptureModule* capture_module,
                     VideoCaptureCapability capability) {
     ASSERT_EQ(0, capture_module->StartCapture(capability));
     EXPECT_TRUE(capture_module->CaptureStarted());
 
     VideoCaptureCapability resulting_capability;
     EXPECT_EQ(0, capture_module->CaptureSettings(resulting_capability));
@@ skipping 31 matching lines @@
 #endif
     capture_observer.SetExpectedCapability(capability);
     ASSERT_NO_FATAL_FAILURE(StartCapture(module.get(), capability));
 
     // Less than 4s to start the camera.
     EXPECT_LE(rtc::TimeMillis() - start_time, 4000);
 
     // Make sure 5 frames are captured.
     EXPECT_TRUE_WAIT(capture_observer.incoming_frames() >= 5, kTimeOut);
 
-    EXPECT_GE(capture_observer.capture_delay(), 0);
-
     int64_t stop_time = rtc::TimeMillis();
     EXPECT_EQ(0, module->StopCapture());
     EXPECT_FALSE(module->CaptureStarted());
 
     // Less than 3s to stop the camera.
     EXPECT_LE(rtc::TimeMillis() - stop_time, 3000);
   }
 }
 
 #ifdef WEBRTC_MAC
@@ skipping 110 matching lines @@
   EXPECT_TRUE_WAIT(capture_observer2.incoming_frames() >= 5, kTimeOut);
   EXPECT_EQ(0, module2->StopCapture());
   EXPECT_EQ(0, module1->StopCapture());
 }
 
 // Test class for testing external capture and capture feedback information
 // such as frame rate and picture alarm.
 class VideoCaptureExternalTest : public testing::Test {
  public:
   void SetUp() {
-    capture_module_ = VideoCaptureFactory::Create(0, capture_input_interface_);
-    process_module_ = webrtc::ProcessThread::Create("ProcessThread");
-    process_module_->Start();
-    process_module_->RegisterModule(capture_module_);
+    capture_module_ = VideoCaptureFactory::Create(capture_input_interface_);
 
     VideoCaptureCapability capability;
     capability.width = kTestWidth;
     capability.height = kTestHeight;
     capability.rawType = webrtc::kVideoYV12;
     capability.maxFPS = kTestFramerate;
     capture_callback_.SetExpectedCapability(capability);
 
     rtc::scoped_refptr<webrtc::I420Buffer> buffer = webrtc::I420Buffer::Create(
         kTestWidth, kTestHeight,
         kTestWidth, ((kTestWidth + 1) / 2), (kTestWidth + 1) / 2);
 
     memset(buffer->MutableDataY(), 127, kTestWidth * kTestHeight);
     memset(buffer->MutableDataU(), 127,
            ((kTestWidth + 1) / 2) * ((kTestHeight + 1) / 2));
     memset(buffer->MutableDataV(), 127,
            ((kTestWidth + 1) / 2) * ((kTestHeight + 1) / 2));
     test_frame_.reset(
         new webrtc::VideoFrame(buffer, 0, 0, webrtc::kVideoRotation_0));
 
     SleepMs(1);  // Wait 1ms so that two tests can't have the same timestamp.
 
-    capture_module_->RegisterCaptureDataCallback(capture_callback_);
-    capture_module_->RegisterCaptureCallback(capture_feedback_);
-    capture_module_->EnableFrameRateCallback(true);
-    capture_module_->EnableNoPictureAlarm(true);
+    capture_module_->RegisterCaptureDataCallback(&capture_callback_);
   }
 
   void TearDown() {
-    process_module_->Stop();
   }
 
   webrtc::VideoCaptureExternal* capture_input_interface_;
   rtc::scoped_refptr<VideoCaptureModule> capture_module_;
-  std::unique_ptr<webrtc::ProcessThread> process_module_;
   std::unique_ptr<webrtc::VideoFrame> test_frame_;
   TestVideoCaptureCallback capture_callback_;
-  TestVideoCaptureFeedBack capture_feedback_;
 };
 
 // Test input of external video frames.
 TEST_F(VideoCaptureExternalTest, TestExternalCapture) {
   size_t length = webrtc::CalcBufferSize(webrtc::kI420,
                                          test_frame_->width(),
                                          test_frame_->height());
   std::unique_ptr<uint8_t[]> test_buffer(new uint8_t[length]);
   webrtc::ExtractBuffer(*test_frame_, length, test_buffer.get());
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
       length, capture_callback_.capability(), 0));
   EXPECT_TRUE(capture_callback_.CompareLastFrame(*test_frame_));
 }
 
-// Test frame rate and no picture alarm.
-// Flaky on Win32, see webrtc:3270.
-#if defined(WEBRTC_WIN) || defined(WEBRTC_MAC)
-#define MAYBE_FrameRate DISABLED_FrameRate
-#else
-#define MAYBE_FrameRate FrameRate
-#endif
-TEST_F(VideoCaptureExternalTest, MAYBE_FrameRate) {
-  int64_t testTime = 3 * rtc::kNumNanosecsPerSec;
-  int64_t startTime = rtc::TimeNanos();
-
-  while ((rtc::TimeNanos() - startTime) < testTime) {
-    size_t length = webrtc::CalcBufferSize(webrtc::kI420,
-                                           test_frame_->width(),
-                                           test_frame_->height());
-    std::unique_ptr<uint8_t[]> test_buffer(new uint8_t[length]);
-    webrtc::ExtractBuffer(*test_frame_, length, test_buffer.get());
-    EXPECT_EQ(
-        0, capture_input_interface_->IncomingFrame(
-               test_buffer.get(), length, capture_callback_.capability(), 0));
-    SleepMs(100);
-  }
-  EXPECT_TRUE(capture_feedback_.frame_rate() >= 8 &&
-              capture_feedback_.frame_rate() <= 10);
-  SleepMs(500);
-  EXPECT_EQ(webrtc::Raised, capture_feedback_.alarm());
-
-  startTime = rtc::TimeNanos();
-  while ((rtc::TimeNanos() - startTime) < testTime) {
-    size_t length = webrtc::CalcBufferSize(webrtc::kI420,
-                                           test_frame_->width(),
-                                           test_frame_->height());
-    std::unique_ptr<uint8_t[]> test_buffer(new uint8_t[length]);
-    webrtc::ExtractBuffer(*test_frame_, length, test_buffer.get());
-    EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
-      length, capture_callback_.capability(), 0));
-    SleepMs(1000 / 30);
-  }
-  EXPECT_EQ(webrtc::Cleared, capture_feedback_.alarm());
-  // Frame rate might be less than 33 since we have paused providing
-  // frames for a while.
-  EXPECT_TRUE(capture_feedback_.frame_rate() >= 25 &&
-              capture_feedback_.frame_rate() <= 33);
-}
-
 TEST_F(VideoCaptureExternalTest, Rotation) {
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_0));
   size_t length = webrtc::CalcBufferSize(webrtc::kI420,
                                          test_frame_->width(),
                                          test_frame_->height());
   std::unique_ptr<uint8_t[]> test_buffer(new uint8_t[length]);
   webrtc::ExtractBuffer(*test_frame_, length, test_buffer.get());
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_90));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_90);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
 }