Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/.

webrtc/media/engine/webrtcmediaengine.h

 /*
  *  Copyright (c) 2011 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 38 matching lines @@
       WebRtcVideoEncoderFactory* video_encoder_factory,
       WebRtcVideoDecoderFactory* video_decoder_factory);
 
   static MediaEngineInterface* Create(
       webrtc::AudioDeviceModule* adm,
       const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
           audio_decoder_factory,
       WebRtcVideoEncoderFactory* video_encoder_factory,
       WebRtcVideoDecoderFactory* video_decoder_factory,
       rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
+
+  static MediaEngineInterface* Create(
+      webrtc::AudioDeviceModule* adm,
+      const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
+          audio_encoder_factory,
+      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+          audio_decoder_factory,
+      WebRtcVideoEncoderFactory* video_encoder_factory,
+      WebRtcVideoDecoderFactory* video_decoder_factory);
+
+  static MediaEngineInterface* Create(
+      webrtc::AudioDeviceModule* adm,
+      const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
+          audio_encoder_factory,
+      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+          audio_decoder_factory,
+      WebRtcVideoEncoderFactory* video_encoder_factory,
+      WebRtcVideoDecoderFactory* video_decoder_factory,
+      rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);

[kwiberg-webrtc, 2017/04/12 09:59:33]

Any chance you could add the new argument to the existing overloads instead?

[ossu, 2017/04/12 10:05:28]

Maybe. I'll try to see if any downstream projects are using this directly, so I
don't break them.

[ossu, 2017/05/02 11:14:51]

Just tried it. They were, so I'm going to have to keep all these overloads. I
should be able to clean this up while removing the need for the extra include in
peerconnectioninteface.h.

 };
 
 // Verify that extension IDs are within 1-byte extension range and are not
 // overlapping.
 bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
 
 // Discard any extensions not validated by the 'supported' predicate. Duplicate
 // extensions are removed if 'filter_redundant_extensions' is set, and also any
 // mutually exclusive extensions (see implementation for details) are removed.
 std::vector<webrtc::RtpExtension> FilterRtpExtensions(
     const std::vector<webrtc::RtpExtension>& extensions,
     bool (*supported)(const std::string&),
     bool filter_redundant_extensions);
 
 webrtc::Call::Config::BitrateConfig GetBitrateConfigForCodec(
     const Codec& codec);
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_