Make cricket::VideoCapturer implement VideoSourceInterface

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 38 matching lines @@
 
 class VideoCapturerTest
     : public sigslot::has_slots<>,
       public testing::Test {
  public:
   VideoCapturerTest()
       : capture_state_(cricket::CS_STOPPED),
         num_state_changes_(0),
         video_frames_received_(0),
         expects_rotation_applied_(true) {
-    capturer_.SignalVideoFrame.connect(this, &VideoCapturerTest::OnVideoFrame);
+    renderer_.SignalRenderFrame.connect(this, &VideoCapturerTest::OnVideoFrame);
     capturer_.SignalStateChange.connect(this,
                                         &VideoCapturerTest::OnStateChange);
+    rtc::VideoSinkCapabilities sink_capabilities;
+    sink_capabilities.can_apply_rotation = !expects_rotation_applied_;

[nisse-webrtc, 2016/02/03 09:16:34]

Is it possible to name these flags in some different way, to avoid negations?

[perkj_webrtc, 2016/02/08 14:32:00]

ptal

+    capturer_.AddSink(&renderer_, sink_capabilities);
   }
 
   void set_expected_compensation(bool compensation) {
     expects_rotation_applied_ = compensation;
+    capturer_.RemoveSink(&renderer_);
+    rtc::VideoSinkCapabilities sink_capabilities;
+    sink_capabilities.can_apply_rotation = !expects_rotation_applied_;
+    capturer_.AddSink(&renderer_, sink_capabilities);
   }
 
  protected:
-  void OnVideoFrame(cricket::VideoCapturer*, const cricket::VideoFrame* frame) {
+  void OnVideoFrame(const cricket::VideoFrame* frame) {
     ++video_frames_received_;
     if (expects_rotation_applied_) {
       EXPECT_EQ(webrtc::kVideoRotation_0, frame->GetRotation());
     } else {
       EXPECT_EQ(capturer_.GetRotation(), frame->GetRotation());
     }
-    renderer_.RenderFrame(frame);
   }
   void OnStateChange(cricket::VideoCapturer*,
                      cricket::CaptureState capture_state) {
     capture_state_ = capture_state;
     ++num_state_changes_;
   }
   cricket::CaptureState capture_state() { return capture_state_; }
   int num_state_changes() { return num_state_changes_; }
   int video_frames_received() const {
     return video_frames_received_;
@@ skipping 184 matching lines @@
   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);
+  set_expected_compensation(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());
 
   // 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
@@ skipping 514 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);
 }