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

Side by Side Diff: webrtc/logging/rtc_event_log/rtc_event_log.cc

Issue 2649323010: Revert of Make RTX pt/apt reconfigurable by calling WebRtcVideoChannel2::SetRecvParameters. (Closed)
Patch Set: Created 3 years, 10 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/rampup_tests.cc ('k') | webrtc/logging/rtc_event_log/rtc_event_log_parser.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) 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 event->set_type(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT); 235 event->set_type(rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT);
236 236
237 rtclog::VideoReceiveConfig* receiver_config = 237 rtclog::VideoReceiveConfig* receiver_config =
238 event->mutable_video_receiver_config(); 238 event->mutable_video_receiver_config();
239 receiver_config->set_remote_ssrc(config.rtp.remote_ssrc); 239 receiver_config->set_remote_ssrc(config.rtp.remote_ssrc);
240 receiver_config->set_local_ssrc(config.rtp.local_ssrc); 240 receiver_config->set_local_ssrc(config.rtp.local_ssrc);
241 241
242 receiver_config->set_rtcp_mode(ConvertRtcpMode(config.rtp.rtcp_mode)); 242 receiver_config->set_rtcp_mode(ConvertRtcpMode(config.rtp.rtcp_mode));
243 receiver_config->set_remb(config.rtp.remb); 243 receiver_config->set_remb(config.rtp.remb);
244 244
245 for (const auto& kv : config.rtp.rtx_payload_types) { 245 for (const auto& kv : config.rtp.rtx) {
246 rtclog::RtxMap* rtx = receiver_config->add_rtx_map(); 246 rtclog::RtxMap* rtx = receiver_config->add_rtx_map();
247 rtx->set_payload_type(kv.first); 247 rtx->set_payload_type(kv.first);
248 rtx->mutable_config()->set_rtx_ssrc(config.rtp.rtx_ssrc); 248 rtx->mutable_config()->set_rtx_ssrc(kv.second.ssrc);
249 rtx->mutable_config()->set_rtx_payload_type(kv.second); 249 rtx->mutable_config()->set_rtx_payload_type(kv.second.payload_type);
250 } 250 }
251 251
252 for (const auto& e : config.rtp.extensions) { 252 for (const auto& e : config.rtp.extensions) {
253 rtclog::RtpHeaderExtension* extension = 253 rtclog::RtpHeaderExtension* extension =
254 receiver_config->add_header_extensions(); 254 receiver_config->add_header_extensions();
255 extension->set_name(e.uri); 255 extension->set_name(e.uri);
256 extension->set_id(e.id); 256 extension->set_id(e.id);
257 } 257 }
258 258
259 for (const auto& d : config.decoders) { 259 for (const auto& d : config.decoders) {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 #else 500 #else
501 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); 501 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
502 #endif // ENABLE_RTC_EVENT_LOG 502 #endif // ENABLE_RTC_EVENT_LOG
503 } 503 }
504 504
505 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() { 505 std::unique_ptr<RtcEventLog> RtcEventLog::CreateNull() {
506 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl()); 506 return std::unique_ptr<RtcEventLog>(new RtcEventLogNullImpl());
507 } 507 }
508 508
509 } // namespace webrtc 509 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/call/rampup_tests.cc ('k') | webrtc/logging/rtc_event_log/rtc_event_log_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698