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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2_unittest.cc

Issue 1315903004: ABANDONED: Remove the default receive channel in WVoE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mediacontroller
Patch Set: fix tests Created 5 years, 2 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 2004 Google Inc. 3 * Copyright 2004 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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 engine_.Init(); 902 engine_.Init();
903 channel_.reset( 903 channel_.reset(
904 engine_.CreateChannel(fake_call_.get(), cricket::VideoOptions())); 904 engine_.CreateChannel(fake_call_.get(), cricket::VideoOptions()));
905 last_ssrc_ = 123; 905 last_ssrc_ = 123;
906 send_parameters_.codecs = engine_.codecs(); 906 send_parameters_.codecs = engine_.codecs();
907 recv_parameters_.codecs = engine_.codecs(); 907 recv_parameters_.codecs = engine_.codecs();
908 ASSERT_TRUE(channel_->SetSendParameters(send_parameters_)); 908 ASSERT_TRUE(channel_->SetSendParameters(send_parameters_));
909 } 909 }
910 910
911 protected: 911 protected:
912 virtual std::vector<cricket::VideoCodec> GetCodecs() {
913 return engine_.codecs();
914 }
915
916 FakeVideoSendStream* AddSendStream() { 912 FakeVideoSendStream* AddSendStream() {
917 return AddSendStream(StreamParams::CreateLegacy(++last_ssrc_)); 913 return AddSendStream(StreamParams::CreateLegacy(++last_ssrc_));
918 } 914 }
919 915
920 FakeVideoSendStream* AddSendStream(const StreamParams& sp) { 916 FakeVideoSendStream* AddSendStream(const StreamParams& sp) {
921 size_t num_streams = fake_call_->GetVideoSendStreams().size(); 917 size_t num_streams = fake_call_->GetVideoSendStreams().size();
922 EXPECT_TRUE(channel_->AddSendStream(sp)); 918 EXPECT_TRUE(channel_->AddSendStream(sp));
923 std::vector<FakeVideoSendStream*> streams = 919 std::vector<FakeVideoSendStream*> streams =
924 fake_call_->GetVideoSendStreams(); 920 fake_call_->GetVideoSendStreams();
925 EXPECT_EQ(num_streams + 1, streams.size()); 921 EXPECT_EQ(num_streams + 1, streams.size());
(...skipping 2275 matching lines...) Expand 10 before | Expand all | Expand 10 after
3201 // Ensures that the correct settings are applied to the codec when two temporal 3197 // Ensures that the correct settings are applied to the codec when two temporal
3202 // layer screencasting is enabled, and that the correct simulcast settings are 3198 // layer screencasting is enabled, and that the correct simulcast settings are
3203 // reapplied when disabling screencasting. 3199 // reapplied when disabling screencasting.
3204 TEST_F(WebRtcVideoChannel2SimulcastTest, 3200 TEST_F(WebRtcVideoChannel2SimulcastTest,
3205 DISABLED_TwoTemporalLayerScreencastSettings) { 3201 DISABLED_TwoTemporalLayerScreencastSettings) {
3206 // TODO(pbos): Implement. 3202 // TODO(pbos): Implement.
3207 FAIL() << "Not implemented."; 3203 FAIL() << "Not implemented.";
3208 } 3204 }
3209 3205
3210 } // namespace cricket 3206 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698