Remove VCMPacketizationCallback

webrtc/video/vie_encoder.cc

Index: webrtc/video/vie_encoder.cc
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
index 8240f9bfa635a32fa7cdd0b0cb0e47a6a0cdc2e0..1fdc5e77f04bf4b7db958a24380da20f56162054 100644
--- a/webrtc/video/vie_encoder.cc
+++ b/webrtc/video/vie_encoder.cc
@@ -91,7 +91,11 @@ ViEEncoder::ViEEncoder(uint32_t number_of_cores,
       ssrcs_(ssrcs),
       vp_(VideoProcessing::Create()),
       qm_callback_(new QMVideoSettingsCallback(vp_.get())),
-      video_sender_(Clock::GetRealTimeClock(), this, this, qm_callback_.get()),
+      video_sender_(Clock::GetRealTimeClock(),
+                    this,
+                    this,
+                    qm_callback_.get(),
+                    this),
       stats_proxy_(stats_proxy),
       pre_encode_callback_(pre_encode_callback),
       overuse_detector_(overuse_detector),
@@ -113,23 +117,10 @@ ViEEncoder::ViEEncoder(uint32_t number_of_cores,
       picture_id_rpsi_(0),
       video_suspended_(false) {
   module_process_thread_->RegisterModule(&video_sender_);
-}
-
-bool ViEEncoder::Init() {
   vp_->EnableTemporalDecimation(true);
 
   // Enable/disable content analysis: off by default for now.
   vp_->EnableContentAnalysis(false);
-
-  // TODO(perkj): Remove  |RegisterTransportCallback| as soon as we don't use
-  // VCMPacketizationCallback::OnEncoderImplementationName.
-  if (video_sender_.RegisterTransportCallback(this) != 0) {
-    return false;
-  }
-  if (video_sender_.RegisterSendStatisticsCallback(this) != 0) {
-    return false;
-  }
-  return true;
 }
 
 vcm::VideoSender* ViEEncoder::video_sender() {
@@ -389,11 +380,6 @@ void ViEEncoder::OnSetRates(uint32_t bitrate_bps, int framerate) {
     stats_proxy_->OnSetRates(bitrate_bps, framerate);
 }
 
-void ViEEncoder::OnEncoderImplementationName(const char* implementation_name) {
-  if (stats_proxy_)
-    stats_proxy_->OnEncoderImplementationName(implementation_name);
-}
-
 int32_t ViEEncoder::Encoded(const EncodedImage& encoded_image,
                             const CodecSpecificInfo* codec_specific_info,
                             const RTPFragmentationHeader* fragmentation) {
@@ -444,9 +430,11 @@ int32_t ViEEncoder::Encoded(const EncodedImage& encoded_image,
 }
 
 int32_t ViEEncoder::SendStatistics(const uint32_t bit_rate,
-                                   const uint32_t frame_rate) {
+                                   const uint32_t frame_rate,
+                                   std::string&& encoder_name) {
   if (stats_proxy_)
-    stats_proxy_->OnOutgoingRate(frame_rate, bit_rate);
+    stats_proxy_->OnEncoderStatsUpdate(frame_rate, bit_rate,

[pbos-webrtc, 2016/05/02 00:16:06]

{}s if this stays multiline

[perkj_webrtc, 2016/05/02 12:02:12]

Done.

+                                       std::move(encoder_name));
   return 0;
 }