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

Side by Side Diff: webrtc/test/call_test.cc

Issue 2826263004: Move responsibility for RTP header extensions on video receive. (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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) { 237 void CallTest::CreateMatchingReceiveConfigs(Transport* rtcp_send_transport) {
238 video_receive_configs_.clear(); 238 video_receive_configs_.clear();
239 allocated_decoders_.clear(); 239 allocated_decoders_.clear();
240 if (num_video_streams_ > 0) { 240 if (num_video_streams_ > 0) {
241 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty()); 241 RTC_DCHECK(!video_send_config_.rtp.ssrcs.empty());
242 VideoReceiveStream::Config video_config(rtcp_send_transport); 242 VideoReceiveStream::Config video_config(rtcp_send_transport);
243 video_config.rtp.remb = false; 243 video_config.rtp.remb = false;
244 video_config.rtp.transport_cc = true; 244 video_config.rtp.transport_cc = true;
245 video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc; 245 video_config.rtp.local_ssrc = kReceiverLocalVideoSsrc;
246 #if 0
246 for (const RtpExtension& extension : video_send_config_.rtp.extensions) 247 for (const RtpExtension& extension : video_send_config_.rtp.extensions)
247 video_config.rtp.extensions.push_back(extension); 248 video_config.rtp.extensions.push_back(extension);
249 #endif
248 video_config.renderer = &fake_renderer_; 250 video_config.renderer = &fake_renderer_;
249 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) { 251 for (size_t i = 0; i < video_send_config_.rtp.ssrcs.size(); ++i) {
250 VideoReceiveStream::Decoder decoder = 252 VideoReceiveStream::Decoder decoder =
251 test::CreateMatchingDecoder(video_send_config_.encoder_settings); 253 test::CreateMatchingDecoder(video_send_config_.encoder_settings);
252 allocated_decoders_.push_back( 254 allocated_decoders_.push_back(
253 std::unique_ptr<VideoDecoder>(decoder.decoder)); 255 std::unique_ptr<VideoDecoder>(decoder.decoder));
254 video_config.decoders.clear(); 256 video_config.decoders.clear();
255 video_config.decoders.push_back(decoder); 257 video_config.decoders.push_back(decoder);
256 video_config.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[i]; 258 video_config.rtp.remote_ssrc = video_send_config_.rtp.ssrcs[i];
257 video_receive_configs_.push_back(video_config.Copy()); 259 video_receive_configs_.push_back(video_config.Copy());
(...skipping 14 matching lines...) Expand all
272 } 274 }
273 275
274 // TODO(brandtr): Update this when we support multistream protection. 276 // TODO(brandtr): Update this when we support multistream protection.
275 RTC_DCHECK(num_flexfec_streams_ <= 1); 277 RTC_DCHECK(num_flexfec_streams_ <= 1);
276 if (num_flexfec_streams_ == 1) { 278 if (num_flexfec_streams_ == 1) {
277 FlexfecReceiveStream::Config config(rtcp_send_transport); 279 FlexfecReceiveStream::Config config(rtcp_send_transport);
278 config.payload_type = kFlexfecPayloadType; 280 config.payload_type = kFlexfecPayloadType;
279 config.remote_ssrc = kFlexfecSendSsrc; 281 config.remote_ssrc = kFlexfecSendSsrc;
280 config.protected_media_ssrcs = {kVideoSendSsrcs[0]}; 282 config.protected_media_ssrcs = {kVideoSendSsrcs[0]};
281 config.local_ssrc = kReceiverLocalVideoSsrc; 283 config.local_ssrc = kReceiverLocalVideoSsrc;
284 #if 0
282 for (const RtpExtension& extension : video_send_config_.rtp.extensions) 285 for (const RtpExtension& extension : video_send_config_.rtp.extensions)
283 config.rtp_header_extensions.push_back(extension); 286 config.rtp_header_extensions.push_back(extension);
287 #endif
284 flexfec_receive_configs_.push_back(config); 288 flexfec_receive_configs_.push_back(config);
285 } 289 }
286 } 290 }
287 291
288 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock, 292 void CallTest::CreateFrameGeneratorCapturerWithDrift(Clock* clock,
289 float speed, 293 float speed,
290 int framerate, 294 int framerate,
291 int width, 295 int width,
292 int height) { 296 int height) {
293 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create( 297 frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 543
540 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) { 544 EndToEndTest::EndToEndTest(unsigned int timeout_ms) : BaseTest(timeout_ms) {
541 } 545 }
542 546
543 bool EndToEndTest::ShouldCreateReceivers() const { 547 bool EndToEndTest::ShouldCreateReceivers() const {
544 return true; 548 return true;
545 } 549 }
546 550
547 } // namespace test 551 } // namespace test
548 } // namespace webrtc 552 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698