Switch from using internal constraints to use explicit PeerConnectionFactoryInterface::SetOptions t…

content/renderer/media/media_stream_dependency_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 286 matching lines @@
                                &native_video_constraints).get());
     source_observer->AddSource(source_data->video_source());
   }
 
   // Do additional source initialization if the audio source is a valid
   // microphone or tab audio.
   RTCMediaConstraints native_audio_constraints(audio_constraints);
   ApplyFixedAudioConstraints(&native_audio_constraints);
   WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks;
   web_stream->audioTracks(audio_tracks);
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableWebRtcAecRecordings)) {
-    native_audio_constraints.AddOptional(
-        RTCMediaConstraints::kInternalAecDump, "true");
-  }
   for (size_t i = 0; i < audio_tracks.size(); ++i) {
     const WebKit::WebMediaStreamSource& source = audio_tracks[i].source();
     MediaStreamSourceExtraData* source_data =
         static_cast<MediaStreamSourceExtraData*>(source.extraData());
 
     // Check if the source has already been created. This happens when the same
     // source is used in multiple MediaStreams as a result of calling
     // getUserMedia.
     if (source_data->local_audio_source())
       continue;
@@ skipping 215 matching lines @@
     // PeerConnectionFactory will hold the ownership of this
     // VideoDecoderFactory.
     decoder_factory.reset(decoder_factory_tv_ = new RTCVideoDecoderFactoryTv());
 #endif
 
     if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
       if (gpu_factories)
         encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
     }
 
+
     scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
         webrtc::CreatePeerConnectionFactory(worker_thread_,
                                             signaling_thread_,
                                             audio_device_.get(),
                                             encoder_factory.release(),
                                             decoder_factory.release()));
-    if (factory.get())
-      pc_factory_ = factory;
-    else
+    if (!factory.get()) {
       audio_device_ = NULL;
+      return false;
+    }
+
+    pc_factory_ = factory;
+    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    PeerConnectionFactoryInterface::Options factory_options;
+    factory_options.enable_aec_dump =
+        cmd_line->HasSwitch(switches::kEnableWebRtcAecRecordings);
+    factory_options.disable_sctp_data_channels=
+        cmd_line->HasSwitch(switches::kDisableSCTPDataChannels);
+    pc_factory_->SetOptions(factory_options);
   }
   return pc_factory_.get() != NULL;

[Ami GONE FROM CHROMIUM, 2013/10/20 20:32:11]

Isn't this unconditionally true now?

[perkj_chrome, 2013/10/21 09:56:58]

yes.... I rewrote the if statement.

 }
 
 bool MediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
   return pc_factory_.get() != NULL;
 }
 
 scoped_refptr<webrtc::PeerConnectionInterface>
 MediaStreamDependencyFactory::CreatePeerConnection(
     const webrtc::PeerConnectionInterface::IceServers& ice_servers,
     const webrtc::MediaConstraintsInterface* constraints,
@@ skipping 272 matching lines @@
   }
 
   // Add the capturer to the WebRtcAudioDeviceImpl if it is a new capturer.
   if (is_new_capturer)
     GetWebRtcAudioDevice()->AddAudioCapturer(capturer);
 
   return capturer;
 }
 
 }  // namespace content