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

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

Issue 1327933002: Full impl of NnChannel::SetSendParameters and NnChannel::SetRecvParameters (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Got rid of SetChannelOptions Created 5 years, 3 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/videoengine_unittest.h
diff --git a/talk/media/base/videoengine_unittest.h b/talk/media/base/videoengine_unittest.h
index 5f00a0eca3c5399508667c93fc3c1257f265a6c5..62d976a6e5ca96b9262b0dc85972c26ad8f3930c 100644
--- a/talk/media/base/videoengine_unittest.h
+++ b/talk/media/base/videoengine_unittest.h
@@ -463,7 +463,9 @@ class VideoMediaChannelTest : public testing::Test,
network_interface_.SetDestination(channel_.get());
channel_->SetInterface(&network_interface_);
media_error_ = cricket::VideoMediaChannel::ERROR_NONE;
+/* TODO(solenberg): !!!!!
channel_->SetRecvCodecs(engine_.codecs());
+*/
EXPECT_TRUE(channel_->AddSendStream(DefaultSendStreamParams()));
video_capturer_.reset(CreateFakeVideoCapturer());
cricket::VideoFormat format(640, 480,
@@ -540,8 +542,10 @@ class VideoMediaChannelTest : public testing::Test,
bool sending = channel_->sending();
bool success = SetSend(false);
+/* TODO(solenberg): !!!!!
if (success)
success = channel_->SetSendCodecs(codecs);
+*/
if (success)
success = SetSend(sending);
return success;
@@ -856,7 +860,9 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_TRUE(SetOneCodec(DefaultCodec()));
cricket::VideoOptions vmo;
vmo.conference_mode.Set(true);
+/* TODO(solenberg): !!!!!
EXPECT_TRUE(channel_->SetOptions(vmo));
+*/
EXPECT_TRUE(SetSend(true));
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(1)));
@@ -904,7 +910,9 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_TRUE(SetOneCodec(DefaultCodec()));
cricket::VideoOptions vmo;
vmo.conference_mode.Set(true);
+/* TODO(solenberg): !!!!!
EXPECT_TRUE(channel_->SetOptions(vmo));
+*/
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(kSsrc)));
EXPECT_TRUE(channel_->SetRenderer(kSsrc, &renderer_));
@@ -969,8 +977,10 @@ class VideoMediaChannelTest : public testing::Test,
// Test that we can set the bandwidth.
void SetSendBandwidth() {
+/* TODO(solenberg): !!!!!
EXPECT_TRUE(channel_->SetMaxSendBandwidth(-1)); // <= 0 means unlimited.
EXPECT_TRUE(channel_->SetMaxSendBandwidth(128 * 1024));
+*/
}
// Test that we can set the SSRC for the default send source.
void SetSendSsrc() {
@@ -1102,7 +1112,9 @@ class VideoMediaChannelTest : public testing::Test,
cricket::FakeVideoRenderer renderer1, renderer2;
cricket::VideoOptions vmo;
vmo.conference_mode.Set(true);
+/* TODO(solenberg): !!!!!
EXPECT_TRUE(channel_->SetOptions(vmo));
+*/
// Ensure we can't set the renderer on a non-existent stream.
EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
@@ -1234,7 +1246,9 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_TRUE(SetDefaultCodec());
cricket::VideoOptions vmo;
vmo.conference_mode.Set(true);
+/* TODO(solenberg): !!!!!
EXPECT_TRUE(channel_->SetOptions(vmo));
+*/
EXPECT_TRUE(SetSend(true));
EXPECT_TRUE(channel_->SetRender(true));
EXPECT_TRUE(channel_->AddRecvStream(
@@ -1650,14 +1664,14 @@ class VideoMediaChannelTest : public testing::Test,
// Mute the channel and expect black output frame.
int frame_count = 0;
- EXPECT_TRUE(channel_->MuteStream(kSsrc, true));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
EXPECT_TRUE(video_capturer.CaptureFrame());
++frame_count;
EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout);
EXPECT_TRUE(renderer_.black_frame());
// Unmute the channel and expect non-black output frame.
- EXPECT_TRUE(channel_->MuteStream(kSsrc, false));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30));
EXPECT_TRUE(video_capturer.CaptureFrame());
++frame_count;
@@ -1665,14 +1679,14 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_FALSE(renderer_.black_frame());
// Test that we can also Mute using the correct send stream SSRC.
- EXPECT_TRUE(channel_->MuteStream(kSsrc, true));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30));
EXPECT_TRUE(video_capturer.CaptureFrame());
++frame_count;
EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout);
EXPECT_TRUE(renderer_.black_frame());
- EXPECT_TRUE(channel_->MuteStream(kSsrc, false));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30));
EXPECT_TRUE(video_capturer.CaptureFrame());
++frame_count;
@@ -1680,15 +1694,15 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_FALSE(renderer_.black_frame());
// Test that muting an existing stream succeeds even if it's muted.
- EXPECT_TRUE(channel_->MuteStream(kSsrc, true));
- EXPECT_TRUE(channel_->MuteStream(kSsrc, true));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
// Test that unmuting an existing stream succeeds even if it's not muted.
- EXPECT_TRUE(channel_->MuteStream(kSsrc, false));
- EXPECT_TRUE(channel_->MuteStream(kSsrc, false));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
+ EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
// Test that muting an invalid stream fails.
- EXPECT_FALSE(channel_->MuteStream(kSsrc+1, true));
+ EXPECT_FALSE(channel_->MuteStream(kSsrc+1, true, nullptr));
EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL));
}

Powered by Google App Engine
This is Rietveld 408576698