Use vcm::VideoSender in ViEEncoder.

webrtc/video/vie_encoder.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.
  */
 
 #ifndef WEBRTC_VIDEO_VIE_ENCODER_H_
 #define WEBRTC_VIDEO_VIE_ENCODER_H_
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/video_encoder.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
+#include "webrtc/modules/video_coding/video_coding_impl.h"
 #include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class Config;
 class EncodedImageCallback;
 class OveruseFrameDetector;
 class PacedSender;
 class PayloadRouter;
@@ skipping 19 matching lines @@
              // TODO(nisse): Used only for tests, delete?
              rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
              OveruseFrameDetector* overuse_detector,
              PacedSender* pacer,
              PayloadRouter* payload_router,
              EncodedImageCallback* post_encode_callback);
   ~ViEEncoder();
 
   bool Init();
 
-  VideoCodingModule* vcm() const;
+  vcm::VideoSender* video_sender();
 
   void SetNetworkTransmissionState(bool is_transmitting);
 
   // Returns the id of the owning channel.
   int Owner() const;
 
   // Drops incoming packets before they get to the encoder.
   void Pause();
   void Restart();
 
   // Codec settings.
   int32_t RegisterExternalEncoder(VideoEncoder* encoder,
                                   uint8_t pl_type,
                                   bool internal_source);
   int32_t DeRegisterExternalEncoder(uint8_t pl_type);
   void SetEncoder(const VideoCodec& video_codec, int min_transmit_bitrate_bps);
 
   void EncodeVideoFrame(const VideoFrame& video_frame);
   void SendKeyFrame();
 
   uint32_t LastObservedBitrateBps() const;
-  int CodecTargetBitrate(uint32_t* bitrate) const;
   // Loss protection. Must be called before SetEncoder() to have max packet size
   // updated according to protection.
-  // TODO(pbos): Set protection method on construction or extract vcm_ outside
-  // this class and set it on construction there.
+  // TODO(pbos): Set protection method on construction.
   void SetProtectionMethod(bool nack, bool fec);
 
   // Implements VideoEncoderRateObserver.
   void OnSetRates(uint32_t bitrate_bps, int framerate) override;
 
   // Implements VCMPacketizationCallback.
   void OnEncoderImplementationName(const char* implementation_name) override;
 
   // Implements EncodedImageCallback.
   int32_t Encoded(const EncodedImage& encoded_image,
@@ skipping 21 matching lines @@
 
   bool EncoderPaused() const EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
   void TraceFrameDropStart() EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
   void TraceFrameDropEnd() EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
 
   const uint32_t number_of_cores_;
   const std::vector<uint32_t> ssrcs_;
 
   const std::unique_ptr<VideoProcessing> vp_;
   const std::unique_ptr<QMVideoSettingsCallback> qm_callback_;
-  const std::unique_ptr<VideoCodingModule> vcm_;
+  vcm::VideoSender video_sender_;
 
   rtc::CriticalSection data_cs_;
 
   SendStatisticsProxy* const stats_proxy_;
   rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
   OveruseFrameDetector* const overuse_detector_;
   PacedSender* const pacer_;
   PayloadRouter* const send_payload_router_;
   EncodedImageCallback* const post_encode_callback_;
 
@@ skipping 17 matching lines @@
   uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
 
   bool video_suspended_ GUARDED_BY(data_cs_);
 
   std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_