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

Side by Side Diff: webrtc/call/bitrate_estimator_tests.cc

Issue 2784543002: Revert of Don't hardcode MediaType::ANY in FakeNetworkPipe. (Closed)
Patch Set: Created 3 years, 8 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 | « webrtc/audio/test/low_bandwidth_audio_test.cc ('k') | webrtc/call/call.cc » ('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 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include <functional> 10 #include <functional>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 public: 101 public:
102 BitrateEstimatorTest() : receive_config_(nullptr) {} 102 BitrateEstimatorTest() : receive_config_(nullptr) {}
103 103
104 virtual ~BitrateEstimatorTest() { EXPECT_TRUE(streams_.empty()); } 104 virtual ~BitrateEstimatorTest() { EXPECT_TRUE(streams_.empty()); }
105 105
106 virtual void SetUp() { 106 virtual void SetUp() {
107 Call::Config config(&event_log_); 107 Call::Config config(&event_log_);
108 receiver_call_.reset(Call::Create(config)); 108 receiver_call_.reset(Call::Create(config));
109 sender_call_.reset(Call::Create(config)); 109 sender_call_.reset(Call::Create(config));
110 110
111 send_transport_.reset( 111 send_transport_.reset(new test::DirectTransport(sender_call_.get()));
112 new test::DirectTransport(sender_call_.get(), MediaType::VIDEO));
113 send_transport_->SetReceiver(receiver_call_->Receiver()); 112 send_transport_->SetReceiver(receiver_call_->Receiver());
114 receive_transport_.reset( 113 receive_transport_.reset(new test::DirectTransport(receiver_call_.get()));
115 new test::DirectTransport(receiver_call_.get(), MediaType::VIDEO));
116 receive_transport_->SetReceiver(sender_call_->Receiver()); 114 receive_transport_->SetReceiver(sender_call_->Receiver());
117 115
118 video_send_config_ = VideoSendStream::Config(send_transport_.get()); 116 video_send_config_ = VideoSendStream::Config(send_transport_.get());
119 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[0]); 117 video_send_config_.rtp.ssrcs.push_back(kVideoSendSsrcs[0]);
120 // Encoders will be set separately per stream. 118 // Encoders will be set separately per stream.
121 video_send_config_.encoder_settings.encoder = nullptr; 119 video_send_config_.encoder_settings.encoder = nullptr;
122 video_send_config_.encoder_settings.payload_name = "FAKE"; 120 video_send_config_.encoder_settings.payload_name = "FAKE";
123 video_send_config_.encoder_settings.payload_type = 121 video_send_config_.encoder_settings.payload_type =
124 kFakeVideoSendPayloadType; 122 kFakeVideoSendPayloadType;
125 test::FillEncoderConfiguration(1, &video_encoder_config_); 123 test::FillEncoderConfiguration(1, &video_encoder_config_);
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId); 297 RtpExtension(RtpExtension::kTimestampOffsetUri, kTOFExtensionId);
300 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog); 298 receiver_log_.PushExpectedLogLine(kAbsSendTimeLog);
301 receiver_log_.PushExpectedLogLine( 299 receiver_log_.PushExpectedLogLine(
302 "WrappingBitrateEstimator: Switching to transmission time offset RBE."); 300 "WrappingBitrateEstimator: Switching to transmission time offset RBE.");
303 streams_.push_back(new Stream(this)); 301 streams_.push_back(new Stream(this));
304 streams_[0]->StopSending(); 302 streams_[0]->StopSending();
305 streams_[1]->StopSending(); 303 streams_[1]->StopSending();
306 EXPECT_TRUE(receiver_log_.Wait()); 304 EXPECT_TRUE(receiver_log_.Wait());
307 } 305 }
308 } // namespace webrtc 306 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/test/low_bandwidth_audio_test.cc ('k') | webrtc/call/call.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698