Non-constraint interfaces for all constrainable interfaces

webrtc/api/localaudiosource.cc

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 59 matching lines @@
 
 rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
     const PeerConnectionFactoryInterface::Options& options,
     const MediaConstraintsInterface* constraints) {
   rtc::scoped_refptr<LocalAudioSource> source(
       new rtc::RefCountedObject<LocalAudioSource>());
   source->Initialize(options, constraints);
   return source;
 }
 
+rtc::scoped_refptr<LocalAudioSource> LocalAudioSource::Create(
+    const PeerConnectionFactoryInterface::Options& options,
+    const cricket::AudioOptions* audio_options) {
+  rtc::scoped_refptr<LocalAudioSource> source(
+      new rtc::RefCountedObject<LocalAudioSource>());
+  source->Initialize(options, audio_options);
+  return source;
+}
+
 void LocalAudioSource::Initialize(
     const PeerConnectionFactoryInterface::Options& options,
     const MediaConstraintsInterface* constraints) {
   if (!constraints)
     return;
 
   // Apply optional constraints first, they will be overwritten by mandatory
   // constraints.
   FromConstraints(constraints->GetOptional(), &options_);
 
   cricket::AudioOptions mandatory_options;
   FromConstraints(constraints->GetMandatory(), &mandatory_options);
   options_.SetAll(mandatory_options);
   source_state_ = kLive;
 }
 
+void LocalAudioSource::Initialize(
+    const PeerConnectionFactoryInterface::Options& options,
+    const cricket::AudioOptions* audio_options) {
+  if (!audio_options)

[perkj_webrtc, 2016/02/23 11:40:18]

I think you should allow audio_options == nullptr

ie- source_state_ = kLive.

Even better- make sure source_state_(kLive) in the ctor and remove setting it
here and in the default Initialize.

[hta-webrtc, 2016/02/23 14:30:34]

The constructor sets source_state_(kInitializing). I thought this code path
strange, but didn't want to change behavior, so I reproduced the previous
behavior, even though it's bizarre. TODO?

[nisse-webrtc, 2016/02/23 15:11:02]

If it's possible to delete all code dealing with a state of "existing, but
somehow invalid", that would be nice.

I'm not sure what the conventions are in our code, but it seems a static Create
method which does new + Initialize is used when initialization needs to call
virtual functions, which doesn't quite work in the constructor. But when doing
things this way, the constructor is usually not public, and hopefully subclasses
can be trusted to do correct initialization so we don't need code to check for
misuse or track the unititialized state.

[perkj_webrtc, 2016/03/01 08:41:26]

It is probably correct in the base class since for video the state changes
depending on how it went to parse the contraints and start the camera. But here
I dont think it make sence. The LocalAudioSource should set it to someting that
make sence. So please fix it in your new code. 
Also- if audio_options is a pointer - I would have suspected that null is ok and
therefore have the state be kLive even if it is null.

[hta-webrtc, 2016/03/02 09:33:40]

It is actually not present in the base class. It's a private field of the
LocalAudioSource class.

If the logic above holds, it serves no purpose and should be removed. OK. Done.

+    return;
+
+  options_ = *audio_options;
+  source_state_ = kLive;
+}
+
 }  // namespace webrtc