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

webrtc/ortc/ortcfactory.cc

 /*
  *  Copyright 2017 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.
  */
 
 #include "webrtc/ortc/ortcfactory.h"
 
 #include <sstream>
 #include <utility>  // For std::move.
 #include <vector>
 
+#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "webrtc/api/mediastreamtrackproxy.h"
 #include "webrtc/api/proxy.h"
 #include "webrtc/api/rtcerror.h"
 #include "webrtc/api/videosourceproxy.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/ortc/ortcrtpreceiveradapter.h"
 #include "webrtc/ortc/ortcrtpsenderadapter.h"
 #include "webrtc/ortc/rtpparametersconversion.h"
 #include "webrtc/ortc/rtptransportadapter.h"
 #include "webrtc/ortc/rtptransportcontrolleradapter.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/udptransport.h"
 #include "webrtc/pc/audiotrack.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/localaudiosource.h"
@@ skipping 122 matching lines @@
                          rtc::Thread* signaling_thread,
                          rtc::NetworkManager* network_manager,
                          rtc::PacketSocketFactory* socket_factory,
                          AudioDeviceModule* adm)
     : network_thread_(network_thread),
       signaling_thread_(signaling_thread),
       network_manager_(network_manager),
       socket_factory_(socket_factory),
       adm_(adm),
       null_event_log_(RtcEventLog::CreateNull()),
+      audio_encoder_factory_(CreateBuiltinAudioEncoderFactory()),
       audio_decoder_factory_(CreateBuiltinAudioDecoderFactory()) {
   if (!rtc::CreateRandomString(kDefaultRtcpCnameLength, &default_cname_)) {
     LOG(LS_ERROR) << "Failed to generate CNAME?";
     RTC_NOTREACHED();
   }
   if (!network_thread_) {
     owned_network_thread_ = rtc::Thread::CreateWithSocketServer();
     owned_network_thread_->Start();
     network_thread_ = owned_network_thread_.get();
   }
@@ skipping 354 matching lines @@
 
 std::unique_ptr<cricket::MediaEngineInterface>
 OrtcFactory::CreateMediaEngine_w() {
   RTC_DCHECK_RUN_ON(worker_thread_.get());
   // The null arguments are optional factories that could be passed into the
   // OrtcFactory, but aren't yet.
   //
   // Note that |adm_| may be null, in which case the platform-specific default
   // AudioDeviceModule will be used.
   return std::unique_ptr<cricket::MediaEngineInterface>(
-      cricket::WebRtcMediaEngineFactory::Create(adm_, audio_decoder_factory_,
-                                                nullptr, nullptr, nullptr));
+      cricket::WebRtcMediaEngineFactory::Create(adm_, audio_encoder_factory_,
+                                                audio_decoder_factory_, nullptr,
+                                                nullptr, nullptr));
 }
 
 }  // namespace webrtc