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

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

Issue 37253002: Add command line flag --disable-webrtc-encryption for dev and canary channels (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating how the disable information is passed to PeerConnection. Created 7 years, 1 month 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 | Annotate | Revision Log
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/media_stream_dependency_factory.h" 5 #include "content/renderer/media/media_stream_dependency_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 return false; 550 return false;
551 } 551 }
552 552
553 pc_factory_ = factory; 553 pc_factory_ = factory;
554 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 554 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
555 PeerConnectionFactoryInterface::Options factory_options; 555 PeerConnectionFactoryInterface::Options factory_options;
556 factory_options.enable_aec_dump = 556 factory_options.enable_aec_dump =
557 cmd_line->HasSwitch(switches::kEnableWebRtcAecRecordings); 557 cmd_line->HasSwitch(switches::kEnableWebRtcAecRecordings);
558 factory_options.disable_sctp_data_channels= 558 factory_options.disable_sctp_data_channels=
559 cmd_line->HasSwitch(switches::kDisableSCTPDataChannels); 559 cmd_line->HasSwitch(switches::kDisableSCTPDataChannels);
560 factory_options.disable_encryption =
561 cmd_line->HasSwitch(switches::kDisableWebRtcEncryption);
560 pc_factory_->SetOptions(factory_options); 562 pc_factory_->SetOptions(factory_options);
561 return true; 563 return true;
562 } 564 }
563 565
564 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() { 566 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
565 return pc_factory_.get() != NULL; 567 return pc_factory_.get() != NULL;
566 } 568 }
567 569
568 scoped_refptr<webrtc::PeerConnectionInterface> 570 scoped_refptr<webrtc::PeerConnectionInterface>
569 MediaStreamDependencyFactory::CreatePeerConnection( 571 MediaStreamDependencyFactory::CreatePeerConnection(
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 } 846 }
845 847
846 // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer. 848 // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer.
847 if (is_new_capturer) 849 if (is_new_capturer)
848 GetWebRtcAudioDevice()->AddAudioCapturer(capturer); 850 GetWebRtcAudioDevice()->AddAudioCapturer(capturer);
849 851
850 return capturer; 852 return capturer;
851 } 853 }
852 854
853 } // namespace content 855 } // namespace content
OLDNEW
« content/public/common/content_switches.cc ('K') | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698