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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 webrtc::RtpExtension::kTransportSequenceNumberUri, | 451 webrtc::RtpExtension::kTransportSequenceNumberUri, |
452 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); | 452 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); |
453 capabilities.header_extensions.push_back( | 453 capabilities.header_extensions.push_back( |
454 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, | 454 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, |
455 webrtc::RtpExtension::kPlayoutDelayDefaultId)); | 455 webrtc::RtpExtension::kPlayoutDelayDefaultId)); |
456 if (IsVideoContentTypeExtensionFieldTrialEnabled()) { | 456 if (IsVideoContentTypeExtensionFieldTrialEnabled()) { |
457 capabilities.header_extensions.push_back( | 457 capabilities.header_extensions.push_back( |
458 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri, | 458 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri, |
459 webrtc::RtpExtension::kVideoContentTypeDefaultId)); | 459 webrtc::RtpExtension::kVideoContentTypeDefaultId)); |
460 } | 460 } |
| 461 capabilities.header_extensions.push_back( |
| 462 webrtc::RtpExtension(webrtc::RtpExtension::kFrameMarkingUri, |
| 463 webrtc::RtpExtension::kFrameMarkingDefaultId)); |
461 // TODO(ilnik): Add kVideoTimingUri/kVideoTimingDefaultId to capabilities. | 464 // TODO(ilnik): Add kVideoTimingUri/kVideoTimingDefaultId to capabilities. |
462 // Possibly inside field trial. | 465 // Possibly inside field trial. |
463 return capabilities; | 466 return capabilities; |
464 } | 467 } |
465 | 468 |
466 void WebRtcVideoEngine::SetExternalDecoderFactory( | 469 void WebRtcVideoEngine::SetExternalDecoderFactory( |
467 WebRtcVideoDecoderFactory* decoder_factory) { | 470 WebRtcVideoDecoderFactory* decoder_factory) { |
468 RTC_DCHECK(!initialized_); | 471 RTC_DCHECK(!initialized_); |
469 external_decoder_factory_ = decoder_factory; | 472 external_decoder_factory_ = decoder_factory; |
470 } | 473 } |
(...skipping 2189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2660 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - | 2663 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - |
2661 1); | 2664 1); |
2662 } | 2665 } |
2663 | 2666 |
2664 std::vector<webrtc::VideoStream> streams; | 2667 std::vector<webrtc::VideoStream> streams; |
2665 streams.push_back(stream); | 2668 streams.push_back(stream); |
2666 return streams; | 2669 return streams; |
2667 } | 2670 } |
2668 | 2671 |
2669 } // namespace cricket | 2672 } // namespace cricket |
OLD | NEW |