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

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

Issue 2774463003: Don't hardcode MediaType::ANY in FakeNetworkPipe. (Closed)
Patch Set: Update FakeCall::DeliverPacket, for consistency with Call::DeliverRtp. 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/call/call.cc ('k') | webrtc/call/rampup_tests.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 10
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 const MediaType media_type_; 186 const MediaType media_type_;
187 187
188 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaTypePacketReceiver); 188 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaTypePacketReceiver);
189 }; 189 };
190 190
191 FakeNetworkPipe::Config audio_net_config; 191 FakeNetworkPipe::Config audio_net_config;
192 audio_net_config.queue_delay_ms = 500; 192 audio_net_config.queue_delay_ms = 500;
193 audio_net_config.loss_percent = 5; 193 audio_net_config.loss_percent = 5;
194 test::PacketTransport audio_send_transport(sender_call_.get(), &observer, 194 test::PacketTransport audio_send_transport(sender_call_.get(), &observer,
195 test::PacketTransport::kSender, 195 test::PacketTransport::kSender,
196 MediaType::AUDIO,
196 audio_net_config); 197 audio_net_config);
197 MediaTypePacketReceiver audio_receiver(receiver_call_->Receiver(), 198 MediaTypePacketReceiver audio_receiver(receiver_call_->Receiver(),
198 MediaType::AUDIO); 199 MediaType::AUDIO);
199 audio_send_transport.SetReceiver(&audio_receiver); 200 audio_send_transport.SetReceiver(&audio_receiver);
200 201
201 test::PacketTransport video_send_transport(sender_call_.get(), &observer, 202 test::PacketTransport video_send_transport(sender_call_.get(), &observer,
202 test::PacketTransport::kSender, 203 test::PacketTransport::kSender,
204 MediaType::VIDEO,
203 FakeNetworkPipe::Config()); 205 FakeNetworkPipe::Config());
204 MediaTypePacketReceiver video_receiver(receiver_call_->Receiver(), 206 MediaTypePacketReceiver video_receiver(receiver_call_->Receiver(),
205 MediaType::VIDEO); 207 MediaType::VIDEO);
206 video_send_transport.SetReceiver(&video_receiver); 208 video_send_transport.SetReceiver(&video_receiver);
207 209
208 test::PacketTransport receive_transport( 210 test::PacketTransport receive_transport(
209 receiver_call_.get(), &observer, test::PacketTransport::kReceiver, 211 receiver_call_.get(), &observer, test::PacketTransport::kReceiver,
212 MediaType::VIDEO,
210 FakeNetworkPipe::Config()); 213 FakeNetworkPipe::Config());
211 receive_transport.SetReceiver(sender_call_->Receiver()); 214 receive_transport.SetReceiver(sender_call_->Receiver());
212 215
213 test::FakeDecoder fake_decoder; 216 test::FakeDecoder fake_decoder;
214 217
215 CreateSendConfig(1, 0, 0, &video_send_transport); 218 CreateSendConfig(1, 0, 0, &video_send_transport);
216 CreateMatchingReceiveConfigs(&receive_transport); 219 CreateMatchingReceiveConfigs(&receive_transport);
217 220
218 AudioSendStream::Config audio_send_config(&audio_send_transport); 221 AudioSendStream::Config audio_send_config(&audio_send_transport);
219 audio_send_config.voe_channel_id = send_channel_id; 222 audio_send_config.voe_channel_id = send_channel_id;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 start_time_ms_(start_time_ms), 338 start_time_ms_(start_time_ms),
336 run_time_ms_(run_time_ms), 339 run_time_ms_(run_time_ms),
337 creation_time_ms_(clock_->TimeInMilliseconds()), 340 creation_time_ms_(clock_->TimeInMilliseconds()),
338 capturer_(nullptr), 341 capturer_(nullptr),
339 rtp_start_timestamp_set_(false), 342 rtp_start_timestamp_set_(false),
340 rtp_start_timestamp_(0) {} 343 rtp_start_timestamp_(0) {}
341 344
342 private: 345 private:
343 test::PacketTransport* CreateSendTransport(Call* sender_call) override { 346 test::PacketTransport* CreateSendTransport(Call* sender_call) override {
344 return new test::PacketTransport( 347 return new test::PacketTransport(
345 sender_call, this, test::PacketTransport::kSender, net_config_); 348 sender_call, this, test::PacketTransport::kSender, MediaType::VIDEO,
349 net_config_);
346 } 350 }
347 351
348 test::PacketTransport* CreateReceiveTransport() override { 352 test::PacketTransport* CreateReceiveTransport() override {
349 return new test::PacketTransport( 353 return new test::PacketTransport(
350 nullptr, this, test::PacketTransport::kReceiver, net_config_); 354 nullptr, this, test::PacketTransport::kReceiver, MediaType::VIDEO,
355 net_config_);
351 } 356 }
352 357
353 void OnFrame(const VideoFrame& video_frame) override { 358 void OnFrame(const VideoFrame& video_frame) override {
354 rtc::CritScope lock(&crit_); 359 rtc::CritScope lock(&crit_);
355 if (video_frame.ntp_time_ms() <= 0) { 360 if (video_frame.ntp_time_ms() <= 0) {
356 // Haven't got enough RTCP SR in order to calculate the capture ntp 361 // Haven't got enough RTCP SR in order to calculate the capture ntp
357 // time. 362 // time.
358 return; 363 return;
359 } 364 }
360 365
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 uint32_t last_set_bitrate_kbps_; 743 uint32_t last_set_bitrate_kbps_;
739 VideoSendStream* send_stream_; 744 VideoSendStream* send_stream_;
740 test::FrameGeneratorCapturer* frame_generator_; 745 test::FrameGeneratorCapturer* frame_generator_;
741 VideoEncoderConfig encoder_config_; 746 VideoEncoderConfig encoder_config_;
742 } test; 747 } test;
743 748
744 RunBaseTest(&test); 749 RunBaseTest(&test);
745 } 750 }
746 751
747 } // namespace webrtc 752 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/call/rampup_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698