WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

webrtc/voice_engine/channel.h

 /*
  *  Copyright (c) 2012 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 157 matching lines @@
   friend class VoERtcpObserver;
 
   enum { KNumSocketThreads = 1 };
   enum { KNumberOfSocketBuffers = 8 };
   virtual ~Channel();
   static int32_t CreateChannel(Channel*& channel,
                                int32_t channelId,
                                uint32_t instanceId,
                                RtcEventLog* const event_log,
                                const Config& config);
+  static int32_t CreateChannel(
+      Channel*& channel,
+      int32_t channelId,
+      uint32_t instanceId,
+      RtcEventLog* const event_log,
+      const Config& config,
+      std::shared_ptr<AudioDecoderFactory> decoder_factory);
   Channel(int32_t channelId,
           uint32_t instanceId,
           RtcEventLog* const event_log,
-          const Config& config);
+          const Config& config,
+          std::shared_ptr<AudioDecoderFactory> decoder_factory);
   int32_t Init();
   int32_t SetEngineInformation(Statistics& engineStatistics,
                                OutputMixer& outputMixer,
                                TransmitMixer& transmitMixer,
                                ProcessThread& moduleProcessThread,
                                AudioDeviceModule& audioDeviceModule,
                                VoiceEngineObserver* voiceEngineObserver,
                                rtc::CriticalSection* callbackCritSect);
   int32_t UpdateLocalTimeStamp();
 
   void SetSink(std::unique_ptr<AudioSinkInterface> sink);
 
+  // TODO(ossu): Don't use! It's only here to confirm that the decoder factory
+  // passed into AudioReceiveStream is the same as the one set when creating the
+  // ADM. Once Channel creation is moved into Audio{Send,Receive}Stream this can
+  // go.
+  const std::shared_ptr<AudioDecoderFactory>& GetAudioDecoderFactory() const;
+
   // API methods
 
   // VoEBase
   int32_t StartPlayout();
   int32_t StopPlayout();
   int32_t StartSend();
   int32_t StopSend();
   int32_t StartReceiving();
   int32_t StopReceiving();
 
@@ skipping 363 matching lines @@
   std::unique_ptr<NetworkPredictor> network_predictor_;
   // An associated send channel.
   rtc::CriticalSection assoc_send_channel_lock_;
   ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
 
   bool pacing_enabled_;
   PacketRouter* packet_router_ = nullptr;
   std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
   std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
   std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
+
+  // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
+  std::shared_ptr<AudioDecoderFactory> decoder_factory_;
 };
 
 }  // namespace voe
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_H_