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

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

Issue 2850793002: Replace VideoReceiveStream::Config with new rtclog::StreamConfig in RtcEventLog. (Closed)
Patch Set: Fix merge. Created 3 years, 7 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
OLDNEW
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 357
358 webrtc::ParsedRtcEventLog parsed_stream; 358 webrtc::ParsedRtcEventLog parsed_stream;
359 if (!parsed_stream.ParseFile(input_file)) { 359 if (!parsed_stream.ParseFile(input_file)) {
360 std::cerr << "Error while parsing input file: " << input_file << std::endl; 360 std::cerr << "Error while parsing input file: " << input_file << std::endl;
361 return -1; 361 return -1;
362 } 362 }
363 363
364 for (size_t i = 0; i < parsed_stream.GetNumberOfEvents(); i++) { 364 for (size_t i = 0; i < parsed_stream.GetNumberOfEvents(); i++) {
365 if (parsed_stream.GetEventType(i) == 365 if (parsed_stream.GetEventType(i) ==
366 webrtc::ParsedRtcEventLog::VIDEO_RECEIVER_CONFIG_EVENT) { 366 webrtc::ParsedRtcEventLog::VIDEO_RECEIVER_CONFIG_EVENT) {
367 webrtc::VideoReceiveStream::Config config(nullptr); 367 webrtc::rtclog::StreamConfig config;
368 parsed_stream.GetVideoReceiveConfig(i, &config); 368 parsed_stream.GetVideoReceiveConfig(i, &config);
369 369
370 global_streams.emplace_back(config.rtp.remote_ssrc, 370 global_streams.emplace_back(config.remote_ssrc,
371 webrtc::MediaType::VIDEO, 371 webrtc::MediaType::VIDEO,
372 webrtc::kIncomingPacket); 372 webrtc::kIncomingPacket);
373 global_streams.emplace_back(config.rtp.local_ssrc, 373 global_streams.emplace_back(config.local_ssrc,
374 webrtc::MediaType::VIDEO, 374 webrtc::MediaType::VIDEO,
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.rtp.remote_ssrc 379 << "\tssrc=" << config.remote_ssrc
380 << "\tfeedback_ssrc=" << config.rtp.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::VideoSendStream::Config config(nullptr);
386 parsed_stream.GetVideoSendConfig(i, &config); 386 parsed_stream.GetVideoSendConfig(i, &config);
387 387
388 for (uint32_t ssrc : config.rtp.ssrcs) { 388 for (uint32_t ssrc : config.rtp.ssrcs) {
389 global_streams.emplace_back(ssrc, webrtc::MediaType::VIDEO, 389 global_streams.emplace_back(ssrc, webrtc::MediaType::VIDEO,
390 webrtc::kOutgoingPacket); 390 webrtc::kOutgoingPacket);
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 PrintPsFeedback(rtcp_block, log_timestamp, direction); 499 PrintPsFeedback(rtcp_block, log_timestamp, direction);
500 break; 500 break;
501 default: 501 default:
502 break; 502 break;
503 } 503 }
504 } 504 }
505 } 505 }
506 } 506 }
507 return 0; 507 return 0;
508 } 508 }
OLDNEW
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log.cc ('k') | webrtc/logging/rtc_event_log/rtc_event_log_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698