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

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

Issue 2064593003: Support legacy offerToReceiveAudio/offerToReceiveVideo fields in RTCOfferAnswerOptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: haraken's comments Created 4 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
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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output) { 677 webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output) {
678 output->offer_to_receive_audio = options.offerToReceiveAudio(); 678 output->offer_to_receive_audio = options.offerToReceiveAudio();
679 output->offer_to_receive_video = options.offerToReceiveVideo(); 679 output->offer_to_receive_video = options.offerToReceiveVideo();
680 output->voice_activity_detection = options.voiceActivityDetection(); 680 output->voice_activity_detection = options.voiceActivityDetection();
681 output->ice_restart = options.iceRestart(); 681 output->ice_restart = options.iceRestart();
682 } 682 }
683 683
684 void ConvertAnswerOptionsToWebrtcAnswerOptions( 684 void ConvertAnswerOptionsToWebrtcAnswerOptions(
685 const blink::WebRTCAnswerOptions& options, 685 const blink::WebRTCAnswerOptions& options,
686 webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output) { 686 webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output) {
687 output->offer_to_receive_audio = options.offerToReceiveAudio();
688 output->offer_to_receive_video = options.offerToReceiveVideo();
687 output->voice_activity_detection = options.voiceActivityDetection(); 689 output->voice_activity_detection = options.voiceActivityDetection();
688 } 690 }
689 691
690 void ConvertConstraintsToWebrtcOfferOptions( 692 void ConvertConstraintsToWebrtcOfferOptions(
691 const blink::WebMediaConstraints& constraints, 693 const blink::WebMediaConstraints& constraints,
692 webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output) { 694 webrtc::PeerConnectionInterface::RTCOfferAnswerOptions* output) {
693 if (constraints.isEmpty()) { 695 if (constraints.isEmpty()) {
694 return; 696 return;
695 } 697 }
696 std::string failing_name; 698 std::string failing_name;
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 } 1794 }
1793 1795
1794 void RTCPeerConnectionHandler::ResetUMAStats() { 1796 void RTCPeerConnectionHandler::ResetUMAStats() {
1795 DCHECK(thread_checker_.CalledOnValidThread()); 1797 DCHECK(thread_checker_.CalledOnValidThread());
1796 num_local_candidates_ipv6_ = 0; 1798 num_local_candidates_ipv6_ = 0;
1797 num_local_candidates_ipv4_ = 0; 1799 num_local_candidates_ipv4_ = 0;
1798 ice_connection_checking_start_ = base::TimeTicks(); 1800 ice_connection_checking_start_ = base::TimeTicks();
1799 memset(ice_state_seen_, 0, sizeof(ice_state_seen_)); 1801 memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
1800 } 1802 }
1801 } // namespace content 1803 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698