Move back receiver VCM into ViEChannel.

webrtc/video/vie_channel.cc

 /*
  *  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 61 matching lines @@
                                      sent_video_rate_bps, sent_nack_rate_bps,
                                      sent_fec_rate_bps);
   }
  private:
   ViEChannel* owner_;
 };
 
 ViEChannel::ViEChannel(Transport* transport,
                        ProcessThread* module_process_thread,
                        PayloadRouter* send_payload_router,
-                       VideoCodingModule* vcm,
                        RtcpIntraFrameObserver* intra_frame_observer,
                        RtcpBandwidthObserver* bandwidth_observer,
                        TransportFeedbackObserver* transport_feedback_observer,
                        RemoteBitrateEstimator* remote_bitrate_estimator,
                        RtcpRttStats* rtt_stats,
                        PacedSender* paced_sender,
                        PacketRouter* packet_router,
                        size_t max_rtp_streams,
                        bool sender)
     : sender_(sender),
       module_process_thread_(module_process_thread),
       send_payload_router_(send_payload_router),
       vcm_protection_callback_(new ViEChannelProtectionCallback(this)),
-      vcm_(vcm),
-      vie_receiver_(vcm_, remote_bitrate_estimator, this),
-      vie_sync_(vcm_),
+      vcm_(sender_ ? nullptr
+                   : VideoCodingModule::Create(Clock::GetRealTimeClock(),
+                                               nullptr,
+                                               nullptr)),
+      vie_receiver_(vcm_.get(), remote_bitrate_estimator, this),
+      vie_sync_(vcm_.get()),
       stats_observer_(new ChannelStatsObserver(this)),
       receive_stats_callback_(nullptr),
       incoming_video_stream_(nullptr),
       intra_frame_observer_(intra_frame_observer),
       rtt_stats_(rtt_stats),
       paced_sender_(paced_sender),
       packet_router_(packet_router),
       bandwidth_observer_(bandwidth_observer),
       transport_feedback_observer_(transport_feedback_observer),
       nack_history_size_sender_(kMinSendSidePacketHistorySize),
@@ skipping 43 matching lines @@
   if (paced_sender_) {
     for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
       rtp_rtcp->SetStorePacketsStatus(true, nack_history_size_sender_);
   }
   packet_router_->AddRtpModule(rtp_rtcp_modules_[0], sender_);
   if (sender_) {
     send_payload_router_->SetSendingRtpModules(
         std::vector<RtpRtcp*>(1, rtp_rtcp_modules_[0]));
     RTC_DCHECK(!send_payload_router_->active());
   } else {
     if (vcm_->RegisterReceiveCallback(this) != 0) {

[danilchap, 2016/02/15 12:25:09]

Can it make sense to join this callbacks initialization with callbacks in
VideoReceiveStream to keep all initialization of vcm_ in one place?

[pbos-webrtc, 2016/02/15 13:04:24]

Done.

       return -1;
     }
     vcm_->RegisterFrameTypeCallback(this);
     vcm_->RegisterReceiveStatisticsCallback(this);
     vcm_->RegisterDecoderTimingCallback(this);
     vcm_->SetRenderDelay(kDefaultRenderDelayMs);
     module_process_thread_->RegisterModule(&vie_sync_);
   }
   return 0;
 }
@@ skipping 637 matching lines @@
   return 0;
 }
 
 int32_t ViEChannel::SetMTU(uint16_t mtu) {
   RTC_DCHECK(sender_);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
     rtp_rtcp->SetMaxTransferUnit(mtu);
   return 0;
 }
 
+VideoCodingModule* ViEChannel::vcm() {
+  return vcm_.get();
+}
+
 RtpRtcp* ViEChannel::rtp_rtcp() {
   return rtp_rtcp_modules_[0];
 }
 
 ViEReceiver* ViEChannel::vie_receiver() {
   return &vie_receiver_;
 }
 
 VCMProtectionCallback* ViEChannel::vcm_protection_callback() {
   return vcm_protection_callback_.get();
@@ skipping 218 matching lines @@
   rtc::CritScope lock(&crit_);
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
   rtc::CritScope lock(&crit_);
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc