| OLD | NEW |
| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 | 108 |
| 109 VideoSendStream* send_stream = | 109 VideoSendStream* send_stream = |
| 110 call->CreateVideoSendStream(send_config, encoder_config); | 110 call->CreateVideoSendStream(send_config, encoder_config); |
| 111 | 111 |
| 112 rtc::scoped_ptr<test::VideoCapturer> capturer(CreateCapturer(send_stream)); | 112 rtc::scoped_ptr<test::VideoCapturer> capturer(CreateCapturer(send_stream)); |
| 113 | 113 |
| 114 VideoReceiveStream::Config receive_config; | 114 VideoReceiveStream::Config receive_config; |
| 115 receive_config.rtp.remote_ssrc = send_config.rtp.ssrcs[0]; | 115 receive_config.rtp.remote_ssrc = send_config.rtp.ssrcs[0]; |
| 116 receive_config.rtp.local_ssrc = kReceiverLocalSsrc; | 116 receive_config.rtp.local_ssrc = kReceiverLocalSsrc; |
| 117 receive_config.rtp.nack.rtp_history_ms = 1000; | 117 receive_config.rtp.nack.rtp_history_ms = 1000; |
| 118 receive_config.rtp.remb = true; |
| 118 receive_config.rtp.rtx[kVideoPayloadType].ssrc = kSendRtxSsrc; | 119 receive_config.rtp.rtx[kVideoPayloadType].ssrc = kSendRtxSsrc; |
| 119 receive_config.rtp.rtx[kVideoPayloadType].payload_type = kRtxVideoPayloadType; | 120 receive_config.rtp.rtx[kVideoPayloadType].payload_type = kRtxVideoPayloadType; |
| 120 receive_config.rtp.extensions.push_back( | 121 receive_config.rtp.extensions.push_back( |
| 121 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); | 122 RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); |
| 122 receive_config.renderer = loopback_video.get(); | 123 receive_config.renderer = loopback_video.get(); |
| 123 VideoReceiveStream::Decoder decoder = | 124 VideoReceiveStream::Decoder decoder = |
| 124 test::CreateMatchingDecoder(send_config.encoder_settings); | 125 test::CreateMatchingDecoder(send_config.encoder_settings); |
| 125 receive_config.decoders.push_back(decoder); | 126 receive_config.decoders.push_back(decoder); |
| 126 | 127 |
| 127 VideoReceiveStream* receive_stream = | 128 VideoReceiveStream* receive_stream = |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 return encoder_config; | 161 return encoder_config; |
| 161 } | 162 } |
| 162 | 163 |
| 163 test::VideoCapturer* Loopback::CreateCapturer(VideoSendStream* send_stream) { | 164 test::VideoCapturer* Loopback::CreateCapturer(VideoSendStream* send_stream) { |
| 164 return test::VideoCapturer::Create(send_stream->Input(), config_.width, | 165 return test::VideoCapturer::Create(send_stream->Input(), config_.width, |
| 165 config_.height, config_.fps, clock_); | 166 config_.height, config_.fps, clock_); |
| 166 } | 167 } |
| 167 | 168 |
| 168 } // namespace test | 169 } // namespace test |
| 169 } // namespace webrtc | 170 } // namespace webrtc |
| OLD | NEW |