OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 webrtc::RtpExtension(webrtc::RtpExtension::kAbsSendTimeUri, | 557 webrtc::RtpExtension(webrtc::RtpExtension::kAbsSendTimeUri, |
558 webrtc::RtpExtension::kAbsSendTimeDefaultId)); | 558 webrtc::RtpExtension::kAbsSendTimeDefaultId)); |
559 capabilities.header_extensions.push_back( | 559 capabilities.header_extensions.push_back( |
560 webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri, | 560 webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri, |
561 webrtc::RtpExtension::kVideoRotationDefaultId)); | 561 webrtc::RtpExtension::kVideoRotationDefaultId)); |
562 if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { | 562 if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { |
563 capabilities.header_extensions.push_back(webrtc::RtpExtension( | 563 capabilities.header_extensions.push_back(webrtc::RtpExtension( |
564 webrtc::RtpExtension::kTransportSequenceNumberUri, | 564 webrtc::RtpExtension::kTransportSequenceNumberUri, |
565 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); | 565 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); |
566 } | 566 } |
| 567 capabilities.header_extensions.push_back( |
| 568 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, |
| 569 webrtc::RtpExtension::kPlayoutDelayDefaultId)); |
567 return capabilities; | 570 return capabilities; |
568 } | 571 } |
569 | 572 |
570 void WebRtcVideoEngine2::SetExternalDecoderFactory( | 573 void WebRtcVideoEngine2::SetExternalDecoderFactory( |
571 WebRtcVideoDecoderFactory* decoder_factory) { | 574 WebRtcVideoDecoderFactory* decoder_factory) { |
572 RTC_DCHECK(!initialized_); | 575 RTC_DCHECK(!initialized_); |
573 external_decoder_factory_ = decoder_factory; | 576 external_decoder_factory_ = decoder_factory; |
574 } | 577 } |
575 | 578 |
576 void WebRtcVideoEngine2::SetExternalEncoderFactory( | 579 void WebRtcVideoEngine2::SetExternalEncoderFactory( |
(...skipping 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2610 rtx_mapping[video_codecs[i].codec.id] != | 2613 rtx_mapping[video_codecs[i].codec.id] != |
2611 fec_settings.red_payload_type) { | 2614 fec_settings.red_payload_type) { |
2612 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2615 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2613 } | 2616 } |
2614 } | 2617 } |
2615 | 2618 |
2616 return video_codecs; | 2619 return video_codecs; |
2617 } | 2620 } |
2618 | 2621 |
2619 } // namespace cricket | 2622 } // namespace cricket |
OLD | NEW |