Chromium Code Reviews| Index: webrtc/video/loopback.cc |
| diff --git a/webrtc/video/loopback.cc b/webrtc/video/loopback.cc |
| index 9083500c1e6a3a80583812f32a97c99e320595b2..2c321f94b9919efe940cad405cc85c087f0691a6 100644 |
| --- a/webrtc/video/loopback.cc |
| +++ b/webrtc/video/loopback.cc |
| @@ -37,6 +37,7 @@ namespace webrtc { |
| namespace test { |
| static const int kAbsSendTimeExtensionId = 7; |
| +static const int kTransportSeqExtensionId = 8; |
| static const uint32_t kSendSsrc = 0x654321; |
| static const uint32_t kSendRtxSsrc = 0x654322; |
| @@ -93,8 +94,13 @@ void Loopback::Run() { |
| send_config.rtp.rtx.ssrcs.push_back(kSendRtxSsrc); |
| send_config.rtp.rtx.payload_type = kRtxVideoPayloadType; |
| send_config.rtp.nack.rtp_history_ms = 1000; |
| + if (config_.send_side_bwe) { |
| + send_config.rtp.extensions.push_back(RtpExtension( |
| + RtpExtension::kTransportSequenceNumber, kTransportSeqExtensionId)); |
| + } else { |
| send_config.rtp.extensions.push_back( |
|
stefan-webrtc
2015/09/17 10:33:19
indentation
sprang_webrtc
2015/09/17 15:08:28
Done.
|
| RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); |
| + } |
| send_config.local_renderer = local_preview.get(); |
| rtc::scoped_ptr<VideoEncoder> encoder; |
| @@ -127,8 +133,14 @@ void Loopback::Run() { |
| receive_config.rtp.remb = true; |
| receive_config.rtp.rtx[payload_type].ssrc = kSendRtxSsrc; |
| receive_config.rtp.rtx[payload_type].payload_type = kRtxVideoPayloadType; |
| - receive_config.rtp.extensions.push_back( |
| - RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); |
| + if (config_.send_side_bwe) { |
| + receive_config.rtp.extensions.push_back(RtpExtension( |
| + RtpExtension::kTransportSequenceNumber, kTransportSeqExtensionId)); |
| + } else { |
| + receive_config.rtp.extensions.push_back( |
| + RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); |
| + receive_config.rtp.remb = true; |
| + } |
| receive_config.renderer = loopback_video.get(); |
| VideoReceiveStream::Decoder decoder = |
| test::CreateMatchingDecoder(send_config.encoder_settings); |