OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 auto pred = [&config](uint32_t ssrc) { | 354 auto pred = [&config](uint32_t ssrc) { |
355 return ssrc == config->rtp.rtx_ssrc; | 355 return ssrc == config->rtp.rtx_ssrc; |
356 }; | 356 }; |
357 if (!std::all_of(rtx_ssrcs.cbegin(), rtx_ssrcs.cend(), pred)) { | 357 if (!std::all_of(rtx_ssrcs.cbegin(), rtx_ssrcs.cend(), pred)) { |
358 LOG(LS_WARNING) << "RtcEventLog protobuf contained different SSRCs for " | 358 LOG(LS_WARNING) << "RtcEventLog protobuf contained different SSRCs for " |
359 "different received RTX payload types. Will only use " | 359 "different received RTX payload types. Will only use " |
360 "rtx_ssrc = " | 360 "rtx_ssrc = " |
361 << config->rtp.rtx_ssrc << "."; | 361 << config->rtp.rtx_ssrc << "."; |
362 } | 362 } |
363 } | 363 } |
| 364 #if 0 |
364 // Get header extensions. | 365 // Get header extensions. |
365 GetHeaderExtensions(&config->rtp.extensions, | 366 GetHeaderExtensions(&config->rtp.extensions, |
366 receiver_config.header_extensions()); | 367 receiver_config.header_extensions()); |
| 368 #endif |
367 // Get decoders. | 369 // Get decoders. |
368 config->decoders.clear(); | 370 config->decoders.clear(); |
369 for (int i = 0; i < receiver_config.decoders_size(); i++) { | 371 for (int i = 0; i < receiver_config.decoders_size(); i++) { |
370 RTC_CHECK(receiver_config.decoders(i).has_name()); | 372 RTC_CHECK(receiver_config.decoders(i).has_name()); |
371 RTC_CHECK(receiver_config.decoders(i).has_payload_type()); | 373 RTC_CHECK(receiver_config.decoders(i).has_payload_type()); |
372 VideoReceiveStream::Decoder decoder; | 374 VideoReceiveStream::Decoder decoder; |
373 decoder.payload_name = receiver_config.decoders(i).name(); | 375 decoder.payload_name = receiver_config.decoders(i).name(); |
374 decoder.payload_type = receiver_config.decoders(i).payload_type(); | 376 decoder.payload_type = receiver_config.decoders(i).payload_type(); |
375 config->decoders.push_back(decoder); | 377 config->decoders.push_back(decoder); |
376 } | 378 } |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 rtc::Optional<ProbeFailureReason>(kInvalidSendReceiveRatio); | 585 rtc::Optional<ProbeFailureReason>(kInvalidSendReceiveRatio); |
584 } else if (pr_event.result() == rtclog::BweProbeResult::TIMEOUT) { | 586 } else if (pr_event.result() == rtclog::BweProbeResult::TIMEOUT) { |
585 res.failure_reason = rtc::Optional<ProbeFailureReason>(kTimeout); | 587 res.failure_reason = rtc::Optional<ProbeFailureReason>(kTimeout); |
586 } else { | 588 } else { |
587 RTC_NOTREACHED(); | 589 RTC_NOTREACHED(); |
588 } | 590 } |
589 | 591 |
590 return res; | 592 return res; |
591 } | 593 } |
592 } // namespace webrtc | 594 } // namespace webrtc |
OLD | NEW |