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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 456
457 virtual void SetUp() { 457 virtual void SetUp() {
458 cricket::Device device("test", "device"); 458 cricket::Device device("test", "device");
459 engine_.Init(); 459 engine_.Init();
460 channel_.reset(engine_.CreateChannel(cricket::VideoOptions(), NULL)); 460 channel_.reset(engine_.CreateChannel(cricket::VideoOptions(), NULL));
461 EXPECT_TRUE(channel_.get() != NULL); 461 EXPECT_TRUE(channel_.get() != NULL);
462 ConnectVideoChannelError(); 462 ConnectVideoChannelError();
463 network_interface_.SetDestination(channel_.get()); 463 network_interface_.SetDestination(channel_.get());
464 channel_->SetInterface(&network_interface_); 464 channel_->SetInterface(&network_interface_);
465 media_error_ = cricket::VideoMediaChannel::ERROR_NONE; 465 media_error_ = cricket::VideoMediaChannel::ERROR_NONE;
466 /* TODO(solenberg): !!!!!
466 channel_->SetRecvCodecs(engine_.codecs()); 467 channel_->SetRecvCodecs(engine_.codecs());
468 */
467 EXPECT_TRUE(channel_->AddSendStream(DefaultSendStreamParams())); 469 EXPECT_TRUE(channel_->AddSendStream(DefaultSendStreamParams()));
468 video_capturer_.reset(CreateFakeVideoCapturer()); 470 video_capturer_.reset(CreateFakeVideoCapturer());
469 cricket::VideoFormat format(640, 480, 471 cricket::VideoFormat format(640, 480,
470 cricket::VideoFormat::FpsToInterval(30), 472 cricket::VideoFormat::FpsToInterval(30),
471 cricket::FOURCC_I420); 473 cricket::FOURCC_I420);
472 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(format)); 474 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(format));
473 EXPECT_TRUE(channel_->SetCapturer(kSsrc, video_capturer_.get())); 475 EXPECT_TRUE(channel_->SetCapturer(kSsrc, video_capturer_.get()));
474 } 476 }
475 477
476 virtual cricket::FakeVideoCapturer* CreateFakeVideoCapturer() { 478 virtual cricket::FakeVideoCapturer* CreateFakeVideoCapturer() {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 535
534 if (video_capturer_) { 536 if (video_capturer_) {
535 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(capture_format)); 537 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_->Start(capture_format));
536 } 538 }
537 if (video_capturer_2_) { 539 if (video_capturer_2_) {
538 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_2_->Start(capture_format)); 540 EXPECT_EQ(cricket::CS_RUNNING, video_capturer_2_->Start(capture_format));
539 } 541 }
540 542
541 bool sending = channel_->sending(); 543 bool sending = channel_->sending();
542 bool success = SetSend(false); 544 bool success = SetSend(false);
545 /* TODO(solenberg): !!!!!
543 if (success) 546 if (success)
544 success = channel_->SetSendCodecs(codecs); 547 success = channel_->SetSendCodecs(codecs);
548 */
545 if (success) 549 if (success)
546 success = SetSend(sending); 550 success = SetSend(sending);
547 return success; 551 return success;
548 } 552 }
549 bool SetSend(bool send) { 553 bool SetSend(bool send) {
550 return channel_->SetSend(send); 554 return channel_->SetSend(send);
551 } 555 }
552 bool SetSendStreamFormat(uint32 ssrc, const cricket::VideoCodec& codec) { 556 bool SetSendStreamFormat(uint32 ssrc, const cricket::VideoCodec& codec) {
553 return channel_->SetSendStreamFormat(ssrc, cricket::VideoFormat( 557 return channel_->SetSendStreamFormat(ssrc, cricket::VideoFormat(
554 codec.width, codec.height, 558 codec.width, codec.height,
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 EXPECT_GT(info.receivers[0].framerate_rcvd, 0); 853 EXPECT_GT(info.receivers[0].framerate_rcvd, 0);
850 EXPECT_GT(info.receivers[0].framerate_decoded, 0); 854 EXPECT_GT(info.receivers[0].framerate_decoded, 0);
851 EXPECT_GT(info.receivers[0].framerate_output, 0); 855 EXPECT_GT(info.receivers[0].framerate_output, 0);
852 } 856 }
853 // Test that stats work properly for a conf call with multiple recv streams. 857 // Test that stats work properly for a conf call with multiple recv streams.
854 void GetStatsMultipleRecvStreams() { 858 void GetStatsMultipleRecvStreams() {
855 cricket::FakeVideoRenderer renderer1, renderer2; 859 cricket::FakeVideoRenderer renderer1, renderer2;
856 EXPECT_TRUE(SetOneCodec(DefaultCodec())); 860 EXPECT_TRUE(SetOneCodec(DefaultCodec()));
857 cricket::VideoOptions vmo; 861 cricket::VideoOptions vmo;
858 vmo.conference_mode.Set(true); 862 vmo.conference_mode.Set(true);
863 /* TODO(solenberg): !!!!!
859 EXPECT_TRUE(channel_->SetOptions(vmo)); 864 EXPECT_TRUE(channel_->SetOptions(vmo));
865 */
860 EXPECT_TRUE(SetSend(true)); 866 EXPECT_TRUE(SetSend(true));
861 EXPECT_TRUE(channel_->AddRecvStream( 867 EXPECT_TRUE(channel_->AddRecvStream(
862 cricket::StreamParams::CreateLegacy(1))); 868 cricket::StreamParams::CreateLegacy(1)));
863 EXPECT_TRUE(channel_->AddRecvStream( 869 EXPECT_TRUE(channel_->AddRecvStream(
864 cricket::StreamParams::CreateLegacy(2))); 870 cricket::StreamParams::CreateLegacy(2)));
865 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1)); 871 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
866 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2)); 872 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
867 EXPECT_TRUE(channel_->SetRender(true)); 873 EXPECT_TRUE(channel_->SetRender(true));
868 EXPECT_EQ(0, renderer1.num_rendered_frames()); 874 EXPECT_EQ(0, renderer1.num_rendered_frames());
869 EXPECT_EQ(0, renderer2.num_rendered_frames()); 875 EXPECT_EQ(0, renderer2.num_rendered_frames());
(...skipping 27 matching lines...) Expand all
897 EXPECT_EQ(DefaultCodec().height, info.receivers[i].frame_height); 903 EXPECT_EQ(DefaultCodec().height, info.receivers[i].frame_height);
898 } 904 }
899 } 905 }
900 // Test that stats work properly for a conf call with multiple send streams. 906 // Test that stats work properly for a conf call with multiple send streams.
901 void GetStatsMultipleSendStreams() { 907 void GetStatsMultipleSendStreams() {
902 // Normal setup; note that we set the SSRC explicitly to ensure that 908 // Normal setup; note that we set the SSRC explicitly to ensure that
903 // it will come first in the senders map. 909 // it will come first in the senders map.
904 EXPECT_TRUE(SetOneCodec(DefaultCodec())); 910 EXPECT_TRUE(SetOneCodec(DefaultCodec()));
905 cricket::VideoOptions vmo; 911 cricket::VideoOptions vmo;
906 vmo.conference_mode.Set(true); 912 vmo.conference_mode.Set(true);
913 /* TODO(solenberg): !!!!!
907 EXPECT_TRUE(channel_->SetOptions(vmo)); 914 EXPECT_TRUE(channel_->SetOptions(vmo));
915 */
908 EXPECT_TRUE(channel_->AddRecvStream( 916 EXPECT_TRUE(channel_->AddRecvStream(
909 cricket::StreamParams::CreateLegacy(kSsrc))); 917 cricket::StreamParams::CreateLegacy(kSsrc)));
910 EXPECT_TRUE(channel_->SetRenderer(kSsrc, &renderer_)); 918 EXPECT_TRUE(channel_->SetRenderer(kSsrc, &renderer_));
911 channel_->UpdateAspectRatio(640, 400); 919 channel_->UpdateAspectRatio(640, 400);
912 EXPECT_TRUE(SetSend(true)); 920 EXPECT_TRUE(SetSend(true));
913 EXPECT_TRUE(channel_->SetRender(true)); 921 EXPECT_TRUE(channel_->SetRender(true));
914 EXPECT_TRUE(SendFrame()); 922 EXPECT_TRUE(SendFrame());
915 EXPECT_TRUE_WAIT(NumRtpPackets() > 0, kTimeout); 923 EXPECT_TRUE_WAIT(NumRtpPackets() > 0, kTimeout);
916 EXPECT_FRAME_WAIT(1, DefaultCodec().width, DefaultCodec().height, kTimeout); 924 EXPECT_FRAME_WAIT(1, DefaultCodec().width, DefaultCodec().height, kTimeout);
917 925
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 EXPECT_EQ(1U, info.senders[1].ssrcs().size()); 970 EXPECT_EQ(1U, info.senders[1].ssrcs().size());
963 EXPECT_EQ(5678U, info.senders[1].ssrcs()[0]); 971 EXPECT_EQ(5678U, info.senders[1].ssrcs()[0]);
964 EXPECT_EQ(kTestWidth, info.senders[1].send_frame_width); 972 EXPECT_EQ(kTestWidth, info.senders[1].send_frame_width);
965 EXPECT_EQ(kTestHeight, info.senders[1].send_frame_height); 973 EXPECT_EQ(kTestHeight, info.senders[1].send_frame_height);
966 // The capturer must be unregistered here as it runs out of it's scope next. 974 // The capturer must be unregistered here as it runs out of it's scope next.
967 EXPECT_TRUE(channel_->SetCapturer(5678, NULL)); 975 EXPECT_TRUE(channel_->SetCapturer(5678, NULL));
968 } 976 }
969 977
970 // Test that we can set the bandwidth. 978 // Test that we can set the bandwidth.
971 void SetSendBandwidth() { 979 void SetSendBandwidth() {
980 /* TODO(solenberg): !!!!!
972 EXPECT_TRUE(channel_->SetMaxSendBandwidth(-1)); // <= 0 means unlimited. 981 EXPECT_TRUE(channel_->SetMaxSendBandwidth(-1)); // <= 0 means unlimited.
973 EXPECT_TRUE(channel_->SetMaxSendBandwidth(128 * 1024)); 982 EXPECT_TRUE(channel_->SetMaxSendBandwidth(128 * 1024));
983 */
974 } 984 }
975 // Test that we can set the SSRC for the default send source. 985 // Test that we can set the SSRC for the default send source.
976 void SetSendSsrc() { 986 void SetSendSsrc() {
977 EXPECT_TRUE(SetDefaultCodec()); 987 EXPECT_TRUE(SetDefaultCodec());
978 EXPECT_TRUE(SetSendStreamFormat(kSsrc, DefaultCodec())); 988 EXPECT_TRUE(SetSendStreamFormat(kSsrc, DefaultCodec()));
979 EXPECT_TRUE(SetSend(true)); 989 EXPECT_TRUE(SetSend(true));
980 EXPECT_TRUE(SendFrame()); 990 EXPECT_TRUE(SendFrame());
981 EXPECT_TRUE_WAIT(NumRtpPackets() > 0, kTimeout); 991 EXPECT_TRUE_WAIT(NumRtpPackets() > 0, kTimeout);
982 uint32 ssrc = 0; 992 uint32 ssrc = 0;
983 rtc::scoped_ptr<const rtc::Buffer> p(GetRtpPacket(0)); 993 rtc::scoped_ptr<const rtc::Buffer> p(GetRtpPacket(0));
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 cricket::StreamParams::CreateLegacy(0))); 1105 cricket::StreamParams::CreateLegacy(0)));
1096 EXPECT_TRUE(channel_->AddRecvStream( 1106 EXPECT_TRUE(channel_->AddRecvStream(
1097 cricket::StreamParams::CreateLegacy(1))); 1107 cricket::StreamParams::CreateLegacy(1)));
1098 } 1108 }
1099 1109
1100 // Tests setting up and configuring multiple incoming streams. 1110 // Tests setting up and configuring multiple incoming streams.
1101 void AddRemoveRecvStreams() { 1111 void AddRemoveRecvStreams() {
1102 cricket::FakeVideoRenderer renderer1, renderer2; 1112 cricket::FakeVideoRenderer renderer1, renderer2;
1103 cricket::VideoOptions vmo; 1113 cricket::VideoOptions vmo;
1104 vmo.conference_mode.Set(true); 1114 vmo.conference_mode.Set(true);
1115 /* TODO(solenberg): !!!!!
1105 EXPECT_TRUE(channel_->SetOptions(vmo)); 1116 EXPECT_TRUE(channel_->SetOptions(vmo));
1117 */
1106 // Ensure we can't set the renderer on a non-existent stream. 1118 // Ensure we can't set the renderer on a non-existent stream.
1107 EXPECT_FALSE(channel_->SetRenderer(1, &renderer1)); 1119 EXPECT_FALSE(channel_->SetRenderer(1, &renderer1));
1108 EXPECT_FALSE(channel_->SetRenderer(2, &renderer2)); 1120 EXPECT_FALSE(channel_->SetRenderer(2, &renderer2));
1109 cricket::VideoRenderer* renderer; 1121 cricket::VideoRenderer* renderer;
1110 EXPECT_FALSE(channel_->GetRenderer(1, &renderer)); 1122 EXPECT_FALSE(channel_->GetRenderer(1, &renderer));
1111 EXPECT_FALSE(channel_->GetRenderer(2, &renderer)); 1123 EXPECT_FALSE(channel_->GetRenderer(2, &renderer));
1112 1124
1113 // Ensure we can add streams. 1125 // Ensure we can add streams.
1114 EXPECT_TRUE(channel_->AddRecvStream( 1126 EXPECT_TRUE(channel_->AddRecvStream(
1115 cricket::StreamParams::CreateLegacy(1))); 1127 cricket::StreamParams::CreateLegacy(1)));
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 // Detach |renderer1| before exit as there might be frames come late. 1239 // Detach |renderer1| before exit as there might be frames come late.
1228 EXPECT_TRUE(channel_->SetRenderer(kSsrc, NULL)); 1240 EXPECT_TRUE(channel_->SetRenderer(kSsrc, NULL));
1229 } 1241 }
1230 1242
1231 // Tests the behavior of incoming streams in a conference scenario. 1243 // Tests the behavior of incoming streams in a conference scenario.
1232 void SimulateConference() { 1244 void SimulateConference() {
1233 cricket::FakeVideoRenderer renderer1, renderer2; 1245 cricket::FakeVideoRenderer renderer1, renderer2;
1234 EXPECT_TRUE(SetDefaultCodec()); 1246 EXPECT_TRUE(SetDefaultCodec());
1235 cricket::VideoOptions vmo; 1247 cricket::VideoOptions vmo;
1236 vmo.conference_mode.Set(true); 1248 vmo.conference_mode.Set(true);
1249 /* TODO(solenberg): !!!!!
1237 EXPECT_TRUE(channel_->SetOptions(vmo)); 1250 EXPECT_TRUE(channel_->SetOptions(vmo));
1251 */
1238 EXPECT_TRUE(SetSend(true)); 1252 EXPECT_TRUE(SetSend(true));
1239 EXPECT_TRUE(channel_->SetRender(true)); 1253 EXPECT_TRUE(channel_->SetRender(true));
1240 EXPECT_TRUE(channel_->AddRecvStream( 1254 EXPECT_TRUE(channel_->AddRecvStream(
1241 cricket::StreamParams::CreateLegacy(1))); 1255 cricket::StreamParams::CreateLegacy(1)));
1242 EXPECT_TRUE(channel_->AddRecvStream( 1256 EXPECT_TRUE(channel_->AddRecvStream(
1243 cricket::StreamParams::CreateLegacy(2))); 1257 cricket::StreamParams::CreateLegacy(2)));
1244 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1)); 1258 EXPECT_TRUE(channel_->SetRenderer(1, &renderer1));
1245 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2)); 1259 EXPECT_TRUE(channel_->SetRenderer(2, &renderer2));
1246 EXPECT_EQ(0, renderer1.num_rendered_frames()); 1260 EXPECT_EQ(0, renderer1.num_rendered_frames());
1247 EXPECT_EQ(0, renderer2.num_rendered_frames()); 1261 EXPECT_EQ(0, renderer2.num_rendered_frames());
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 cricket::VideoFormat::FpsToInterval(30), 1657 cricket::VideoFormat::FpsToInterval(30),
1644 cricket::FOURCC_I420)); 1658 cricket::FOURCC_I420));
1645 EXPECT_TRUE(channel_->SetCapturer(kSsrc, &video_capturer)); 1659 EXPECT_TRUE(channel_->SetCapturer(kSsrc, &video_capturer));
1646 EXPECT_TRUE(SetSend(true)); 1660 EXPECT_TRUE(SetSend(true));
1647 EXPECT_TRUE(channel_->SetRender(true)); 1661 EXPECT_TRUE(channel_->SetRender(true));
1648 EXPECT_TRUE(channel_->SetRenderer(kDefaultReceiveSsrc, &renderer_)); 1662 EXPECT_TRUE(channel_->SetRenderer(kDefaultReceiveSsrc, &renderer_));
1649 EXPECT_EQ(0, renderer_.num_rendered_frames()); 1663 EXPECT_EQ(0, renderer_.num_rendered_frames());
1650 1664
1651 // Mute the channel and expect black output frame. 1665 // Mute the channel and expect black output frame.
1652 int frame_count = 0; 1666 int frame_count = 0;
1653 EXPECT_TRUE(channel_->MuteStream(kSsrc, true)); 1667 EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
1654 EXPECT_TRUE(video_capturer.CaptureFrame()); 1668 EXPECT_TRUE(video_capturer.CaptureFrame());
1655 ++frame_count; 1669 ++frame_count;
1656 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout); 1670 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout);
1657 EXPECT_TRUE(renderer_.black_frame()); 1671 EXPECT_TRUE(renderer_.black_frame());
1658 1672
1659 // Unmute the channel and expect non-black output frame. 1673 // Unmute the channel and expect non-black output frame.
1660 EXPECT_TRUE(channel_->MuteStream(kSsrc, false)); 1674 EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
1661 EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30)); 1675 EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30));
1662 EXPECT_TRUE(video_capturer.CaptureFrame()); 1676 EXPECT_TRUE(video_capturer.CaptureFrame());
1663 ++frame_count; 1677 ++frame_count;
1664 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout); 1678 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout);
1665 EXPECT_FALSE(renderer_.black_frame()); 1679 EXPECT_FALSE(renderer_.black_frame());
1666 1680
1667 // Test that we can also Mute using the correct send stream SSRC. 1681 // Test that we can also Mute using the correct send stream SSRC.
1668 EXPECT_TRUE(channel_->MuteStream(kSsrc, true)); 1682 EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
1669 EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30)); 1683 EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30));
1670 EXPECT_TRUE(video_capturer.CaptureFrame()); 1684 EXPECT_TRUE(video_capturer.CaptureFrame());
1671 ++frame_count; 1685 ++frame_count;
1672 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout); 1686 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout);
1673 EXPECT_TRUE(renderer_.black_frame()); 1687 EXPECT_TRUE(renderer_.black_frame());
1674 1688
1675 EXPECT_TRUE(channel_->MuteStream(kSsrc, false)); 1689 EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
1676 EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30)); 1690 EXPECT_TRUE(rtc::Thread::Current()->ProcessMessages(30));
1677 EXPECT_TRUE(video_capturer.CaptureFrame()); 1691 EXPECT_TRUE(video_capturer.CaptureFrame());
1678 ++frame_count; 1692 ++frame_count;
1679 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout); 1693 EXPECT_EQ_WAIT(frame_count, renderer_.num_rendered_frames(), kTimeout);
1680 EXPECT_FALSE(renderer_.black_frame()); 1694 EXPECT_FALSE(renderer_.black_frame());
1681 1695
1682 // Test that muting an existing stream succeeds even if it's muted. 1696 // Test that muting an existing stream succeeds even if it's muted.
1683 EXPECT_TRUE(channel_->MuteStream(kSsrc, true)); 1697 EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
1684 EXPECT_TRUE(channel_->MuteStream(kSsrc, true)); 1698 EXPECT_TRUE(channel_->MuteStream(kSsrc, true, nullptr));
1685 1699
1686 // Test that unmuting an existing stream succeeds even if it's not muted. 1700 // Test that unmuting an existing stream succeeds even if it's not muted.
1687 EXPECT_TRUE(channel_->MuteStream(kSsrc, false)); 1701 EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
1688 EXPECT_TRUE(channel_->MuteStream(kSsrc, false)); 1702 EXPECT_TRUE(channel_->MuteStream(kSsrc, false, nullptr));
1689 1703
1690 // Test that muting an invalid stream fails. 1704 // Test that muting an invalid stream fails.
1691 EXPECT_FALSE(channel_->MuteStream(kSsrc+1, true)); 1705 EXPECT_FALSE(channel_->MuteStream(kSsrc+1, true, nullptr));
1692 EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL)); 1706 EXPECT_TRUE(channel_->SetCapturer(kSsrc, NULL));
1693 } 1707 }
1694 1708
1695 // Test that multiple send streams can be created and deleted properly. 1709 // Test that multiple send streams can be created and deleted properly.
1696 void MultipleSendStreams() { 1710 void MultipleSendStreams() {
1697 // Remove stream added in Setup. I.e. remove stream corresponding to default 1711 // Remove stream added in Setup. I.e. remove stream corresponding to default
1698 // channel. 1712 // channel.
1699 EXPECT_TRUE(channel_->RemoveSendStream(kSsrc)); 1713 EXPECT_TRUE(channel_->RemoveSendStream(kSsrc));
1700 const unsigned int kSsrcsSize = sizeof(kSsrcs4)/sizeof(kSsrcs4[0]); 1714 const unsigned int kSsrcsSize = sizeof(kSsrcs4)/sizeof(kSsrcs4[0]);
1701 for (unsigned int i = 0; i < kSsrcsSize; ++i) { 1715 for (unsigned int i = 0; i < kSsrcsSize; ++i) {
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 rtc::scoped_ptr<C> channel_; 1894 rtc::scoped_ptr<C> channel_;
1881 cricket::FakeNetworkInterface network_interface_; 1895 cricket::FakeNetworkInterface network_interface_;
1882 cricket::FakeVideoRenderer renderer_; 1896 cricket::FakeVideoRenderer renderer_;
1883 cricket::VideoMediaChannel::Error media_error_; 1897 cricket::VideoMediaChannel::Error media_error_;
1884 1898
1885 // Used by test cases where 2 streams are run on the same channel. 1899 // Used by test cases where 2 streams are run on the same channel.
1886 cricket::FakeVideoRenderer renderer2_; 1900 cricket::FakeVideoRenderer renderer2_;
1887 }; 1901 };
1888 1902
1889 #endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT 1903 #endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698