Move back receiver VCM into ViEChannel.

webrtc/video/vie_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 49 matching lines @@
                    public VCMDecoderTimingCallback,
                    public VCMPacketRequestCallback,
                    public RtpFeedback {
  public:
   friend class ChannelStatsObserver;
   friend class ViEChannelProtectionCallback;
 
   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);
   ~ViEChannel();
@@ skipping 80 matching lines @@
   void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override;
 
   int32_t StartSend();
   int32_t StopSend();
 
   // Sets the maximum transfer unit size for the network link, i.e. including
   // IP, UDP and RTP headers.
   int32_t SetMTU(uint16_t mtu);
 
   // Gets the modules used by the channel.
+  VideoCodingModule* vcm();
   RtpRtcp* rtp_rtcp();
   ViEReceiver* vie_receiver();
   VCMProtectionCallback* vcm_protection_callback();
 
 
   CallStatsObserver* GetStatsObserver();
 
   // Implements VCMReceiveCallback.
   virtual int32_t FrameToRender(VideoFrame& video_frame);  // NOLINT
 
@@ skipping 169 matching lines @@
 
   ProcessThread* const module_process_thread_;
   PayloadRouter* const send_payload_router_;
 
   // Used for all registered callbacks except rendering.
   rtc::CriticalSection crit_;
 
   // Owned modules/classes.
   rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_;
 
-  VideoCodingModule* const vcm_;
+  const rtc::scoped_ptr<VideoCodingModule> vcm_;

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

std::unique_ptr instead of rtc::scoped_ptr is now allowed.

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

Will replace them all when they've been used more elsewhere, so keeping
scoped_ptr for consistency.

   ViEReceiver vie_receiver_;
   ViESyncModule vie_sync_;
 
   // Helper to report call statistics.
   rtc::scoped_ptr<ChannelStatsObserver> stats_observer_;
 
   // Not owned.
   ReceiveStatisticsProxy* receive_stats_callback_ GUARDED_BY(crit_);
   FrameCounts receive_frame_counts_ GUARDED_BY(crit_);
   IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_);
@@ skipping 17 matching lines @@
   size_t num_rtts_ GUARDED_BY(crit_);
 
   // RtpRtcp modules, declared last as they use other members on construction.
   const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_CHANNEL_H_