Index: webrtc/media/base/videocapturer_unittest.cc |
diff --git a/webrtc/media/base/videocapturer_unittest.cc b/webrtc/media/base/videocapturer_unittest.cc |
index 25230b5118a80517ff861d5bb473019f58528332..821de5838c8d2acaa9fe82adcc42444914624ac1 100644 |
--- a/webrtc/media/base/videocapturer_unittest.cc |
+++ b/webrtc/media/base/videocapturer_unittest.cc |
@@ -91,14 +91,14 @@ TEST_F(VideoCapturerTest, ScreencastScaledOddWidth) { |
std::vector<cricket::VideoFormat> formats; |
formats.push_back(cricket::VideoFormat(kWidth, kHeight, |
- cricket::VideoFormat::FpsToInterval(5), cricket::FOURCC_ARGB)); |
+ cricket::VideoFormat::FpsToInterval(5), |
+ cricket::FOURCC_I420)); |
capturer_->ResetSupportedFormats(formats); |
- EXPECT_EQ(cricket::CS_RUNNING, capturer_->Start(cricket::VideoFormat( |
- kWidth, |
- kHeight, |
- cricket::VideoFormat::FpsToInterval(30), |
- cricket::FOURCC_ARGB))); |
+ EXPECT_EQ(cricket::CS_RUNNING, |
+ capturer_->Start(cricket::VideoFormat( |
+ kWidth, kHeight, cricket::VideoFormat::FpsToInterval(30), |
+ cricket::FOURCC_ANY))); |
EXPECT_TRUE(capturer_->IsRunning()); |
EXPECT_EQ(0, renderer_.num_rendered_frames()); |
EXPECT_TRUE(capturer_->CaptureFrame()); |
@@ -245,6 +245,10 @@ TEST_F(VideoCapturerTest, TestRotationAppliedBySourceWhenDifferentWants) { |
EXPECT_EQ(webrtc::kVideoRotation_0, renderer2.rotation()); |
} |
+// TODO(nisse): This test doesn't quite fit here. It tests two things: |
+// Aggregation of VideoSinkWants, which is the responsibility of |
+// VideoBroadcaster, and translation of VideoSinkWants to actual |
+// resolution, which is the responsibility of the VideoAdapter. |
TEST_F(VideoCapturerTest, SinkWantsMaxPixelAndMaxPixelCountStepUp) { |
EXPECT_EQ(cricket::CS_RUNNING, |
capturer_->Start(cricket::VideoFormat( |