Include default communication devices in audio device enumerations. This removes heuristic that pic…

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

 // Copyright 2014 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/webrtc/peer_connection_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 47 matching lines @@
 #include "media/base/android/media_codec_bridge.h"
 #endif
 
 namespace content {
 
 // Map of corresponding media constraints and platform effects.
 struct {
   const char* constraint;
   const media::AudioParameters::PlatformEffectsMask effect;
 } const kConstraintEffectMap[] = {
-  { content::kMediaStreamAudioDucking,
-    media::AudioParameters::DUCKING },
   { webrtc::MediaConstraintsInterface::kGoogEchoCancellation,
     media::AudioParameters::ECHO_CANCELLER },
 };
 
 // If any platform effects are available, check them against the constraints.
 // Disable effects to match false constraints, but if a constraint is true, set
 // the constraint to false to later disable the software effect.
 //
 // This function may modify both |constraints| and |effects|.
 void HarmonizeConstraintsAndEffects(RTCMediaConstraints* constraints,
@@ skipping 16 matching lines @@
         // set the constraint to false to later disable the software effect.
         if (is_mandatory) {
           constraints->AddMandatory(kConstraintEffectMap[i].constraint,
               webrtc::MediaConstraintsInterface::kValueFalse, true);
         } else {
           constraints->AddOptional(kConstraintEffectMap[i].constraint,
               webrtc::MediaConstraintsInterface::kValueFalse, true);
         }
         DVLOG(1) << "Disabling constraint: "
                  << kConstraintEffectMap[i].constraint;
-      } else if (kConstraintEffectMap[i].effect ==
-                 media::AudioParameters::DUCKING && value && !is_mandatory) {
-        // Special handling of the DUCKING flag that sets the optional
-        // constraint to |false| to match what the device will support.
-        constraints->AddOptional(kConstraintEffectMap[i].constraint,
-            webrtc::MediaConstraintsInterface::kValueFalse, true);
-        // No need to modify |effects| since the ducking flag is already off.
-        DCHECK((*effects & media::AudioParameters::DUCKING) == 0);
       }
     }
   }
 }
 
 class P2PPortAllocatorFactory : public webrtc::PortAllocatorFactoryInterface {
  public:
   P2PPortAllocatorFactory(P2PSocketDispatcher* socket_dispatcher,
                           rtc::NetworkManager* network_manager,
                           rtc::PacketSocketFactory* socket_factory,
@@ skipping 563 matching lines @@
 }
 
 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   if (audio_device_.get())
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content