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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 1941343002: Manual cherry-pick of 'Propagate googScreencastMinBitrate constraint to webrtc.' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Rebase. Created 4 years, 7 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/rtc_peer_connection_handler.h" 5 #include "content/renderer/media/rtc_peer_connection_handler.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 configuration->enable_dscp = ConstraintToOptional( 320 configuration->enable_dscp = ConstraintToOptional(
321 constraints, &blink::WebMediaTrackConstraintSet::enableDscp); 321 constraints, &blink::WebMediaTrackConstraintSet::enableDscp);
322 configuration->cpu_overuse_detection = ConstraintToOptional( 322 configuration->cpu_overuse_detection = ConstraintToOptional(
323 constraints, &blink::WebMediaTrackConstraintSet::googCpuOveruseDetection); 323 constraints, &blink::WebMediaTrackConstraintSet::googCpuOveruseDetection);
324 configuration->enable_rtp_data_channel = ScanConstraintsForBoolean( 324 configuration->enable_rtp_data_channel = ScanConstraintsForBoolean(
325 constraints, &blink::WebMediaTrackConstraintSet::enableRtpDataChannels, 325 constraints, &blink::WebMediaTrackConstraintSet::enableRtpDataChannels,
326 false, nullptr); 326 false, nullptr);
327 configuration->suspend_below_min_bitrate = ConstraintToOptional( 327 configuration->suspend_below_min_bitrate = ConstraintToOptional(
328 constraints, &blink::WebMediaTrackConstraintSet:: 328 constraints, &blink::WebMediaTrackConstraintSet::
329 googEnableVideoSuspendBelowMinBitrate); 329 googEnableVideoSuspendBelowMinBitrate);
330 // TODO: Special treatment for screencast min bitrate, since it's an integer. 330 int rate;
331 // if (FindConstraint(constraints, 331 if (GetConstraintValueAsInteger(
332 // MediaConstraintsInterface::kScreencastMinBitrate, 332 constraints,
333 // &configuration->screencast_min_bitrate, NULL)) { 333 &blink::WebMediaTrackConstraintSet::googScreencastMinBitrate,
334 // configuration->override_screencast_min_bitrate = true; 334 &rate)) {
335 // } 335 configuration->screencast_min_bitrate = rtc::Optional<int>(rate);
336 }
336 configuration->combined_audio_video_bwe = ConstraintToOptional( 337 configuration->combined_audio_video_bwe = ConstraintToOptional(
337 constraints, 338 constraints,
338 &blink::WebMediaTrackConstraintSet::googCombinedAudioVideoBwe); 339 &blink::WebMediaTrackConstraintSet::googCombinedAudioVideoBwe);
339 configuration->enable_dtls_srtp = ConstraintToOptional( 340 configuration->enable_dtls_srtp = ConstraintToOptional(
340 constraints, &blink::WebMediaTrackConstraintSet::enableDtlsSrtp); 341 constraints, &blink::WebMediaTrackConstraintSet::enableDtlsSrtp);
341 } 342 }
342 343
343 class SessionDescriptionRequestTracker { 344 class SessionDescriptionRequestTracker {
344 public: 345 public:
345 SessionDescriptionRequestTracker( 346 SessionDescriptionRequestTracker(
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1818 } 1819 }
1819 1820
1820 void RTCPeerConnectionHandler::ResetUMAStats() { 1821 void RTCPeerConnectionHandler::ResetUMAStats() {
1821 DCHECK(thread_checker_.CalledOnValidThread()); 1822 DCHECK(thread_checker_.CalledOnValidThread());
1822 num_local_candidates_ipv6_ = 0; 1823 num_local_candidates_ipv6_ = 0;
1823 num_local_candidates_ipv4_ = 0; 1824 num_local_candidates_ipv4_ = 0;
1824 ice_connection_checking_start_ = base::TimeTicks(); 1825 ice_connection_checking_start_ = base::TimeTicks();
1825 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1826 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1826 } 1827 }
1827 } // namespace content 1828 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698