OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
375 webrtc::kOutgoingPacket); | 375 webrtc::kOutgoingPacket); |
376 | 376 |
377 if (!FLAGS_noconfig && !FLAGS_novideo && !FLAGS_noincoming) { | 377 if (!FLAGS_noconfig && !FLAGS_novideo && !FLAGS_noincoming) { |
378 std::cout << parsed_stream.GetTimestamp(i) << "\tVIDEO_RECV_CONFIG" | 378 std::cout << parsed_stream.GetTimestamp(i) << "\tVIDEO_RECV_CONFIG" |
379 << "\tssrc=" << config.remote_ssrc | 379 << "\tssrc=" << config.remote_ssrc |
380 << "\tfeedback_ssrc=" << config.local_ssrc << std::endl; | 380 << "\tfeedback_ssrc=" << config.local_ssrc << std::endl; |
381 } | 381 } |
382 } | 382 } |
383 if (parsed_stream.GetEventType(i) == | 383 if (parsed_stream.GetEventType(i) == |
384 webrtc::ParsedRtcEventLog::VIDEO_SENDER_CONFIG_EVENT) { | 384 webrtc::ParsedRtcEventLog::VIDEO_SENDER_CONFIG_EVENT) { |
385 webrtc::VideoSendStream::Config config(nullptr); | 385 webrtc::rtclog::StreamConfig config; |
386 parsed_stream.GetVideoSendConfig(i, &config); | 386 parsed_stream.GetVideoSendConfig(i, &config); |
| 387 global_streams.emplace_back(config.local_ssrc, webrtc::MediaType::VIDEO, |
| 388 webrtc::kOutgoingPacket); |
387 | 389 |
388 for (uint32_t ssrc : config.rtp.ssrcs) { | 390 global_streams.emplace_back(config.rtx_ssrc, webrtc::MediaType::VIDEO, |
389 global_streams.emplace_back(ssrc, webrtc::MediaType::VIDEO, | 391 webrtc::kOutgoingPacket); |
390 webrtc::kOutgoingPacket); | |
391 } | |
392 for (uint32_t ssrc : config.rtp.rtx.ssrcs) { | |
393 global_streams.emplace_back(ssrc, webrtc::MediaType::VIDEO, | |
394 webrtc::kOutgoingPacket); | |
395 } | |
396 | 392 |
397 if (!FLAGS_noconfig && !FLAGS_novideo && !FLAGS_nooutgoing) { | 393 if (!FLAGS_noconfig && !FLAGS_novideo && !FLAGS_nooutgoing) { |
398 std::cout << parsed_stream.GetTimestamp(i) << "\tVIDEO_SEND_CONFIG"; | 394 std::cout << parsed_stream.GetTimestamp(i) << "\tVIDEO_SEND_CONFIG"; |
399 std::cout << "\tssrcs="; | 395 std::cout << "\tssrcs=" << config.local_ssrc; |
400 for (const auto& ssrc : config.rtp.ssrcs) | 396 std::cout << "\trtx_ssrcs=" << config.rtx_ssrc; |
401 std::cout << ssrc << ','; | |
402 std::cout << "\trtx_ssrcs="; | |
403 for (const auto& ssrc : config.rtp.rtx.ssrcs) | |
404 std::cout << ssrc << ','; | |
405 std::cout << std::endl; | 397 std::cout << std::endl; |
406 } | 398 } |
407 } | 399 } |
408 if (parsed_stream.GetEventType(i) == | 400 if (parsed_stream.GetEventType(i) == |
409 webrtc::ParsedRtcEventLog::AUDIO_RECEIVER_CONFIG_EVENT) { | 401 webrtc::ParsedRtcEventLog::AUDIO_RECEIVER_CONFIG_EVENT) { |
410 webrtc::AudioReceiveStream::Config config; | 402 webrtc::AudioReceiveStream::Config config; |
411 parsed_stream.GetAudioReceiveConfig(i, &config); | 403 parsed_stream.GetAudioReceiveConfig(i, &config); |
412 global_streams.emplace_back(config.rtp.remote_ssrc, | 404 global_streams.emplace_back(config.rtp.remote_ssrc, |
413 webrtc::MediaType::AUDIO, | 405 webrtc::MediaType::AUDIO, |
414 webrtc::kIncomingPacket); | 406 webrtc::kIncomingPacket); |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
499 PrintPsFeedback(rtcp_block, log_timestamp, direction); | 491 PrintPsFeedback(rtcp_block, log_timestamp, direction); |
500 break; | 492 break; |
501 default: | 493 default: |
502 break; | 494 break; |
503 } | 495 } |
504 } | 496 } |
505 } | 497 } |
506 } | 498 } |
507 return 0; | 499 return 0; |
508 } | 500 } |
OLD | NEW |