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

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

Issue 1386653002: Remove default receive channel from WVoE; baby step 0. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 engine_.Init(); 901 engine_.Init();
902 channel_.reset( 902 channel_.reset(
903 engine_.CreateChannel(fake_call_.get(), cricket::VideoOptions())); 903 engine_.CreateChannel(fake_call_.get(), cricket::VideoOptions()));
904 last_ssrc_ = 123; 904 last_ssrc_ = 123;
905 send_parameters_.codecs = engine_.codecs(); 905 send_parameters_.codecs = engine_.codecs();
906 recv_parameters_.codecs = engine_.codecs(); 906 recv_parameters_.codecs = engine_.codecs();
907 ASSERT_TRUE(channel_->SetSendParameters(send_parameters_)); 907 ASSERT_TRUE(channel_->SetSendParameters(send_parameters_));
908 } 908 }
909 909
910 protected: 910 protected:
911 virtual std::vector<cricket::VideoCodec> GetCodecs() {
912 return engine_.codecs();
913 }
914
915 FakeVideoSendStream* AddSendStream() { 911 FakeVideoSendStream* AddSendStream() {
916 return AddSendStream(StreamParams::CreateLegacy(++last_ssrc_)); 912 return AddSendStream(StreamParams::CreateLegacy(++last_ssrc_));
917 } 913 }
918 914
919 FakeVideoSendStream* AddSendStream(const StreamParams& sp) { 915 FakeVideoSendStream* AddSendStream(const StreamParams& sp) {
920 size_t num_streams = fake_call_->GetVideoSendStreams().size(); 916 size_t num_streams = fake_call_->GetVideoSendStreams().size();
921 EXPECT_TRUE(channel_->AddSendStream(sp)); 917 EXPECT_TRUE(channel_->AddSendStream(sp));
922 std::vector<FakeVideoSendStream*> streams = 918 std::vector<FakeVideoSendStream*> streams =
923 fake_call_->GetVideoSendStreams(); 919 fake_call_->GetVideoSendStreams();
924 EXPECT_EQ(num_streams + 1, streams.size()); 920 EXPECT_EQ(num_streams + 1, streams.size());
(...skipping 2272 matching lines...) Expand 10 before | Expand all | Expand 10 after
3197 // Ensures that the correct settings are applied to the codec when two temporal 3193 // Ensures that the correct settings are applied to the codec when two temporal
3198 // layer screencasting is enabled, and that the correct simulcast settings are 3194 // layer screencasting is enabled, and that the correct simulcast settings are
3199 // reapplied when disabling screencasting. 3195 // reapplied when disabling screencasting.
3200 TEST_F(WebRtcVideoChannel2SimulcastTest, 3196 TEST_F(WebRtcVideoChannel2SimulcastTest,
3201 DISABLED_TwoTemporalLayerScreencastSettings) { 3197 DISABLED_TwoTemporalLayerScreencastSettings) {
3202 // TODO(pbos): Implement. 3198 // TODO(pbos): Implement.
3203 FAIL() << "Not implemented."; 3199 FAIL() << "Not implemented.";
3204 } 3200 }
3205 3201
3206 } // namespace cricket 3202 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698