Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: talk/media/base/videoengine_unittest.h

Issue 1602283003: Delete GetRenderer method, used only by the tests. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Deleted accidentally left #if 0 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
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/videoengine_unittest.h
diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h
index 00ee92923d36afbb27715c4ec938206a7c88df8b..c1b20490a5c2b8e06031a7c1884e6639a3686251 100644
--- a/talk/media/base/videoengine_unittest.h
+++ b/talk/media/base/videoengine_unittest.h
@@ -770,40 +770,23 @@ class VideoMediaChannelTest : public testing::Test,
// Ensure we can't set the renderer on a non-existent stream.
EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
- cricket::VideoRenderer* renderer;
- EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
- EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
// Ensure we can add streams.
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(1)));
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(2)));
- EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
- EXPECT_TRUE(renderer == NULL);
- EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
- EXPECT_TRUE(NULL == renderer);
// Ensure we can now set the renderers.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
- EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
- EXPECT_TRUE(&renderer1 == renderer);
- EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
- EXPECT_TRUE(&renderer2 == renderer);
// Ensure we can change the renderers if needed.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer2));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer1));
- EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
- EXPECT_TRUE(&renderer2 == renderer);
- EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
- EXPECT_TRUE(&renderer1 == renderer);
EXPECT_TRUE(channel_->RemoveRecvStream(2));
EXPECT_TRUE(channel_->RemoveRecvStream(1));
- EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
- EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
}
// Tests setting up and configuring multiple incoming streams in a
@@ -813,41 +796,23 @@ class VideoMediaChannelTest : public testing::Test,
// Ensure we can't set the renderer on a non-existent stream.
EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
- cricket::VideoRenderer* renderer;
- EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
- EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
// Ensure we can add streams.
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(1)));
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(2)));
- EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
- // Verify the first AddRecvStream hook up to the default renderer.
- EXPECT_TRUE(renderer == NULL);
- EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
- EXPECT_TRUE(NULL == renderer);
// Ensure we can now set the renderers.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
- EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
- EXPECT_TRUE(&renderer1 == renderer);
- EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
- EXPECT_TRUE(&renderer2 == renderer);
// Ensure we can change the renderers if needed.
EXPECT_TRUE(channel_->SetRenderer(1, &renderer2));
EXPECT_TRUE(channel_->SetRenderer(2, &renderer1));
- EXPECT_TRUE(channel_->GetRenderer(1, &renderer));
- EXPECT_TRUE(&renderer2 == renderer);
- EXPECT_TRUE(channel_->GetRenderer(2, &renderer));
- EXPECT_TRUE(&renderer1 == renderer);
EXPECT_TRUE(channel_->RemoveRecvStream(2));
EXPECT_TRUE(channel_->RemoveRecvStream(1));
- EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
- EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
}
// Test that no frames are rendered after the receive stream have been
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698