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

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

Issue 2923563002: Add field trial for balanced degradation preference. (Closed)
Patch Set: rebase Created 3 years, 6 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/webrtcvideoengine_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 1724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 // Do not adapt resolution for screen content as this will likely 1735 // Do not adapt resolution for screen content as this will likely
1736 // result in blurry and unreadable text. 1736 // result in blurry and unreadable text.
1737 // |this| acts like a VideoSource to make sure SinkWants are handled on the 1737 // |this| acts like a VideoSource to make sure SinkWants are handled on the
1738 // correct thread. 1738 // correct thread.
1739 DegradationPreference degradation_preference; 1739 DegradationPreference degradation_preference;
1740 if (!enable_cpu_overuse_detection_) { 1740 if (!enable_cpu_overuse_detection_) {
1741 degradation_preference = DegradationPreference::kDegradationDisabled; 1741 degradation_preference = DegradationPreference::kDegradationDisabled;
1742 } else { 1742 } else {
1743 if (parameters_.options.is_screencast.value_or(false)) { 1743 if (parameters_.options.is_screencast.value_or(false)) {
1744 degradation_preference = DegradationPreference::kMaintainResolution; 1744 degradation_preference = DegradationPreference::kMaintainResolution;
1745 } else if (webrtc::field_trial::IsEnabled(
1746 "WebRTC-Video-BalancedDegradation")) {
1747 degradation_preference = DegradationPreference::kBalanced;
1745 } else { 1748 } else {
1746 degradation_preference = DegradationPreference::kMaintainFramerate; 1749 degradation_preference = DegradationPreference::kMaintainFramerate;
1747 } 1750 }
1748 } 1751 }
1749 return degradation_preference; 1752 return degradation_preference;
1750 } 1753 }
1751 1754
1752 const std::vector<uint32_t>& 1755 const std::vector<uint32_t>&
1753 WebRtcVideoChannel::WebRtcVideoSendStream::GetSsrcs() const { 1756 WebRtcVideoChannel::WebRtcVideoSendStream::GetSsrcs() const {
1754 return ssrcs_; 1757 return ssrcs_;
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 rtx_mapping[video_codecs[i].codec.id] != 2672 rtx_mapping[video_codecs[i].codec.id] !=
2670 ulpfec_config.red_payload_type) { 2673 ulpfec_config.red_payload_type) {
2671 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2674 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2672 } 2675 }
2673 } 2676 }
2674 2677
2675 return video_codecs; 2678 return video_codecs;
2676 } 2679 }
2677 2680
2678 } // namespace cricket 2681 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698