Use vcm::VideoReceiver on the receive side.

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 25 matching lines @@
 class EncodedImageCallback;
 class I420FrameCallback;
 class IncomingVideoStream;
 class PacedSender;
 class PacketRouter;
 class PayloadRouter;
 class ProcessThread;
 class ReceiveStatisticsProxy;
 class RtcpRttStats;
 class ViERTPObserver;
-class VideoCodingModule;
 class VideoRenderCallback;
 class VoEVideoSync;
 
+namespace vcm {
+class VideoReceiver;
+}  // namespace vcm
+
 enum StreamType {
   kViEStreamTypeNormal = 0,  // Normal media stream
   kViEStreamTypeRtx = 1      // Retransmission media stream
 };
 
 class ViEChannel : public VCMFrameTypeCallback,
                    public VCMReceiveCallback,
                    public VCMReceiveStatisticsCallback,
                    public VCMDecoderTimingCallback,
                    public VCMPacketRequestCallback,
                    public RtpFeedback {
  public:
   friend class ChannelStatsObserver;
 
   ViEChannel(Transport* transport,
              ProcessThread* module_process_thread,
-             VideoCodingModule* vcm,
+             vcm::VideoReceiver* video_receiver,
              RemoteBitrateEstimator* remote_bitrate_estimator,
              RtcpRttStats* rtt_stats,
              PacedSender* paced_sender,
              PacketRouter* packet_router);
   ~ViEChannel();
 
   int32_t Init();
 
   void SetProtectionMode(bool enable_nack,
                          bool enable_fec,
@@ skipping 112 matching lines @@
 
    private:
   } rtcp_packet_type_counter_observer_;
 
 
   ProcessThread* const module_process_thread_;
 
   // Used for all registered callbacks except rendering.
   rtc::CriticalSection crit_;
 
-  VideoCodingModule* const vcm_;
+  vcm::VideoReceiver* const video_receiver_;
   ViEReceiver vie_receiver_;
 
   // Helper to report call statistics.
   std::unique_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_);
   RtcpRttStats* const rtt_stats_;
   PacedSender* const paced_sender_;
   PacketRouter* const packet_router_;
 
   int max_nack_reordering_threshold_;
   I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);
 
   int64_t last_rtt_ms_ GUARDED_BY(crit_);
 
   // RtpRtcp module, declared last as it use other members on construction.
   const std::unique_ptr<RtpRtcp> rtp_rtcp_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_CHANNEL_H_