OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 222 matching lines...) Loading... | |
233 event->set_type(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT); | 233 event->set_type(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT); |
234 | 234 |
235 rtclog::VideoReceiveConfig* receiver_config = | 235 rtclog::VideoReceiveConfig* receiver_config = |
236 event->mutable_video_receiver_config(); | 236 event->mutable_video_receiver_config(); |
237 receiver_config->set_remote_ssrc(config.rtp.remote_ssrc); | 237 receiver_config->set_remote_ssrc(config.rtp.remote_ssrc); |
238 receiver_config->set_local_ssrc(config.rtp.local_ssrc); | 238 receiver_config->set_local_ssrc(config.rtp.local_ssrc); |
239 | 239 |
240 receiver_config->set_rtcp_mode(ConvertRtcpMode(config.rtp.rtcp_mode)); | 240 receiver_config->set_rtcp_mode(ConvertRtcpMode(config.rtp.rtcp_mode)); |
241 receiver_config->set_remb(config.rtp.remb); | 241 receiver_config->set_remb(config.rtp.remb); |
242 | 242 |
243 for (const auto& kv : config.rtp.rtx) { | 243 for (const auto& kv : config.rtp.rtx_payload_types) { |
244 rtclog::RtxMap* rtx = receiver_config->add_rtx_map(); | 244 rtclog::RtxMap* rtx = receiver_config->add_rtx_map(); |
245 rtx->set_payload_type(kv.first); | 245 rtx->set_payload_type(kv.first); |
246 rtx->mutable_config()->set_rtx_ssrc(kv.second.ssrc); | 246 rtx->mutable_config()->set_rtx_ssrc(config.rtp.rtx_ssrc); |
brandtr
2017/01/20 14:49:22
Always writing the same SSRC here, which is effect
| |
247 rtx->mutable_config()->set_rtx_payload_type(kv.second.payload_type); | 247 rtx->mutable_config()->set_rtx_payload_type(kv.second); |
248 } | 248 } |
249 | 249 |
250 for (const auto& e : config.rtp.extensions) { | 250 for (const auto& e : config.rtp.extensions) { |
251 rtclog::RtpHeaderExtension* extension = | 251 rtclog::RtpHeaderExtension* extension = |
252 receiver_config->add_header_extensions(); | 252 receiver_config->add_header_extensions(); |
253 extension->set_name(e.uri); | 253 extension->set_name(e.uri); |
254 extension->set_id(e.id); | 254 extension->set_id(e.id); |
255 } | 255 } |
256 | 256 |
257 for (const auto& d : config.decoders) { | 257 for (const auto& d : config.decoders) { |
(...skipping 217 matching lines...) Loading... | |
475 #else | 475 #else |
476 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); | 476 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); |
477 #endif // ENABLE_RTC_EVENT_LOG | 477 #endif // ENABLE_RTC_EVENT_LOG |
478 } | 478 } |
479 | 479 |
480 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() { | 480 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() { |
481 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); | 481 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); |
482 } | 482 } |
483 | 483 |
484 } // namespace webrtc | 484 } // namespace webrtc |
OLD | NEW |