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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 2300003002: Enable send-side BWE by default. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: nit addressed. Created 4 years, 3 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
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 RtpCapabilities capabilities; 573 RtpCapabilities capabilities;
574 capabilities.header_extensions.push_back( 574 capabilities.header_extensions.push_back(
575 webrtc::RtpExtension(webrtc::RtpExtension::kTimestampOffsetUri, 575 webrtc::RtpExtension(webrtc::RtpExtension::kTimestampOffsetUri,
576 webrtc::RtpExtension::kTimestampOffsetDefaultId)); 576 webrtc::RtpExtension::kTimestampOffsetDefaultId));
577 capabilities.header_extensions.push_back( 577 capabilities.header_extensions.push_back(
578 webrtc::RtpExtension(webrtc::RtpExtension::kAbsSendTimeUri, 578 webrtc::RtpExtension(webrtc::RtpExtension::kAbsSendTimeUri,
579 webrtc::RtpExtension::kAbsSendTimeDefaultId)); 579 webrtc::RtpExtension::kAbsSendTimeDefaultId));
580 capabilities.header_extensions.push_back( 580 capabilities.header_extensions.push_back(
581 webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri, 581 webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri,
582 webrtc::RtpExtension::kVideoRotationDefaultId)); 582 webrtc::RtpExtension::kVideoRotationDefaultId));
583 if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { 583 capabilities.header_extensions.push_back(webrtc::RtpExtension(
584 capabilities.header_extensions.push_back(webrtc::RtpExtension( 584 webrtc::RtpExtension::kTransportSequenceNumberUri,
585 webrtc::RtpExtension::kTransportSequenceNumberUri, 585 webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
586 webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
587 }
588 capabilities.header_extensions.push_back( 586 capabilities.header_extensions.push_back(
589 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, 587 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri,
590 webrtc::RtpExtension::kPlayoutDelayDefaultId)); 588 webrtc::RtpExtension::kPlayoutDelayDefaultId));
591 return capabilities; 589 return capabilities;
592 } 590 }
593 591
594 void WebRtcVideoEngine2::SetExternalDecoderFactory( 592 void WebRtcVideoEngine2::SetExternalDecoderFactory(
595 WebRtcVideoDecoderFactory* decoder_factory) { 593 WebRtcVideoDecoderFactory* decoder_factory) {
596 RTC_DCHECK(!initialized_); 594 RTC_DCHECK(!initialized_);
597 external_decoder_factory_ = decoder_factory; 595 external_decoder_factory_ = decoder_factory;
(...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2709 rtx_mapping[video_codecs[i].codec.id] != 2707 rtx_mapping[video_codecs[i].codec.id] !=
2710 fec_settings.red_payload_type) { 2708 fec_settings.red_payload_type) {
2711 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2709 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2712 } 2710 }
2713 } 2711 }
2714 2712
2715 return video_codecs; 2713 return video_codecs;
2716 } 2714 }
2717 2715
2718 } // namespace cricket 2716 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698