talk/media/base/capturemanager_unittest.cc - Issue 1594973006: New rtc::VideoSinkInterface.

Unified Diff: talk/media/base/capturemanager_unittest.cc

Issue 1594973006: New rtc::VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Use rtc::VideoSinkInterface on the call chain VideoSource --> CaptureRenderAdapter Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: talk/media/base/capturemanager_unittest.cc

diff --git a/talk/media/base/capturemanager_unittest.cc b/talk/media/base/capturemanager_unittest.cc

index 709ec5bb8d3b95b633357a53ed982281f4448ebb..88c771c327326c3e7415caf7bd448159121b17c6 100644

--- a/talk/media/base/capturemanager_unittest.cc

+++ b/talk/media/base/capturemanager_unittest.cc

@@ -91,8 +91,8 @@ class CaptureManagerTest : public ::testing::Test, public sigslot::has_slots<> {

// 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_.AddVideoSink(&video_capturer_,

+ &video_renderer_));

}

TEST_F(CaptureManagerTest, InvalidAddingRemoving) {

@@ -102,7 +102,7 @@ TEST_F(CaptureManagerTest, InvalidAddingRemoving) {

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_.AddVideoSink(&video_capturer_, NULL));

EXPECT_TRUE(capture_manager_.StopVideoCapture(&video_capturer_, format_vga_));

}

@@ -112,8 +112,8 @@ TEST_F(CaptureManagerTest, KeepFirstResolutionHigh) {

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_.AddVideoSink(&video_capturer_,

+ &video_renderer_));

EXPECT_TRUE(video_capturer_.CaptureFrame());

EXPECT_EQ(1, NumFramesRendered());

// Renderer should be fed frames with the resolution of format_vga_.

@@ -142,8 +142,8 @@ TEST_F(CaptureManagerTest, KeepFirstResolutionLow) {

format_qvga_));

EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,

format_vga_));

- EXPECT_TRUE(capture_manager_.AddVideoRenderer(&video_capturer_,

- &video_renderer_));

+ EXPECT_TRUE(capture_manager_.AddVideoSink(&video_capturer_,

+ &video_renderer_));

EXPECT_EQ_WAIT(1, callback_count(), kMsCallbackWait);

EXPECT_TRUE(video_capturer_.CaptureFrame());

EXPECT_EQ(1, NumFramesRendered());

@@ -164,8 +164,8 @@ TEST_F(CaptureManagerTest, MultipleStartStops) {

format_qvga_));

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_.AddVideoSink(&video_capturer_,

+ &video_renderer_));

// Ensure that a frame can be captured when two start calls have been made.

EXPECT_TRUE(video_capturer_.CaptureFrame());

EXPECT_EQ(1, NumFramesRendered());

@@ -189,8 +189,8 @@ TEST_F(CaptureManagerTest, MultipleStartStops) {

TEST_F(CaptureManagerTest, TestForceRestart) {

EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,

format_qvga_));

- EXPECT_TRUE(capture_manager_.AddVideoRenderer(&video_capturer_,

- &video_renderer_));

+ EXPECT_TRUE(capture_manager_.AddVideoSink(&video_capturer_,

+ &video_renderer_));

EXPECT_EQ_WAIT(1, callback_count(), kMsCallbackWait);

EXPECT_TRUE(video_capturer_.CaptureFrame());

EXPECT_EQ(1, NumFramesRendered());

@@ -209,8 +209,8 @@ TEST_F(CaptureManagerTest, TestForceRestart) {

TEST_F(CaptureManagerTest, TestRequestRestart) {

EXPECT_TRUE(capture_manager_.StartVideoCapture(&video_capturer_,

format_vga_));

- EXPECT_TRUE(capture_manager_.AddVideoRenderer(&video_capturer_,

- &video_renderer_));

+ EXPECT_TRUE(capture_manager_.AddVideoSink(&video_capturer_,

+ &video_renderer_));

pthatcher1 2016/01/27 01:11:03 You can just remove all the expects on the return

nisse-webrtc 2016/01/27 09:08:51 Done. I have no choice with a void return value...

EXPECT_EQ_WAIT(1, callback_count(), kMsCallbackWait);

EXPECT_TRUE(video_capturer_.CaptureFrame());

EXPECT_EQ(1, NumFramesRendered());

« talk/media/base/capturemanager.h ('K') | « talk/media/base/capturemanager.cc ('k') | talk/media/base/capturerenderadapter.h » ('j') | talk/media/base/capturerenderadapter.h » ('J')