Revert of Deprecate VCMPacketizationCallback::SendData and use EncodedImageCallback instead.

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 0c781b866348615cab185c8ecc3876ba23f3a157..de3ab7117523f02f71dc0bcd8abe51d61cf0af12 100644
--- a/webrtc/video/vie_encoder.cc
+++ b/webrtc/video/vie_encoder.cc
@@ -85,8 +85,7 @@
                        rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
                        OveruseFrameDetector* overuse_detector,
                        PacedSender* pacer,
-                       PayloadRouter* payload_router,
-                       EncodedImageCallback* post_encode_callback)
+                       PayloadRouter* payload_router)
     : number_of_cores_(number_of_cores),
       ssrcs_(ssrcs),
       vp_(VideoProcessing::Create()),
@@ -99,7 +98,6 @@
       overuse_detector_(overuse_detector),
       pacer_(pacer),
       send_payload_router_(payload_router),
-      post_encode_callback_(post_encode_callback),
       time_of_last_frame_activity_ms_(0),
       encoder_config_(),
       min_transmit_bitrate_bps_(0),
@@ -123,10 +121,6 @@
   // Enable/disable content analysis: off by default for now.
   vp_->EnableContentAnalysis(false);
 
-  vcm_->RegisterPostEncodeImageCallback(this);
-
-  // TODO(perkj): Remove  |RegisterTransportCallback| as soon as we don't use
-  // VCMPacketizationCallback::OnEncoderImplementationName.
   if (vcm_->RegisterTransportCallback(this) != 0) {
     return false;
   }
@@ -409,14 +403,10 @@
     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) {
+int32_t ViEEncoder::SendData(const uint8_t payload_type,
+                             const EncodedImage& encoded_image,
+                             const RTPFragmentationHeader* fragmentation_header,
+                             const RTPVideoHeader* rtp_video_hdr) {
   RTC_DCHECK(send_payload_router_);
 
   {
@@ -424,22 +414,17 @@
     time_of_last_frame_activity_ms_ = TickTime::MillisecondTimestamp();
   }
 
-  if (post_encode_callback_) {
-    post_encode_callback_->Encoded(encoded_image, codec_specific_info,
-                                   fragmentation);
-  }
-
-  if (stats_proxy_) {
-    stats_proxy_->OnSendEncodedImage(encoded_image, codec_specific_info);
-  }
-  int success = send_payload_router_->Encoded(
-      encoded_image, codec_specific_info, fragmentation);
+  if (stats_proxy_)
+    stats_proxy_->OnSendEncodedImage(encoded_image, rtp_video_hdr);
+
+  bool success = send_payload_router_->RoutePayload(
+      encoded_image._frameType, payload_type, encoded_image._timeStamp,
+      encoded_image.capture_time_ms_, encoded_image._buffer,
+      encoded_image._length, fragmentation_header, rtp_video_hdr);
   overuse_detector_->FrameSent(encoded_image._timeStamp);
 
   if (kEnableFrameRecording) {
-    int layer = codec_specific_info->codecType == kVideoCodecVP8
-                    ? codec_specific_info->codecSpecific.VP8.simulcastIdx
-                    : 0;
+    int layer = rtp_video_hdr->simulcastIdx;
     IvfFileWriter* file_writer;
     {
       rtc::CritScope lock(&data_cs_);
@@ -450,7 +435,7 @@
           oss << "_" << ssrc;
         oss << "_layer" << layer << ".ivf";
         file_writers_[layer] =
-            IvfFileWriter::Open(oss.str(), codec_specific_info->codecType);
+            IvfFileWriter::Open(oss.str(), rtp_video_hdr->codec);
       }
       file_writer = file_writers_[layer].get();
     }
@@ -460,7 +445,13 @@
     }
   }
 
-  return success;
+  return success ? 0 : -1;
+}
+
+void ViEEncoder::OnEncoderImplementationName(
+    const char* implementation_name) {
+  if (stats_proxy_)
+    stats_proxy_->OnEncoderImplementationName(implementation_name);
 }
 
 int32_t ViEEncoder::SendStatistics(const uint32_t bit_rate,
@@ -540,6 +531,11 @@
     stats_proxy_->OnSuspendChange(video_is_suspended);
 }
 
+void ViEEncoder::RegisterPostEncodeImageCallback(
+      EncodedImageCallback* post_encode_callback) {
+  vcm_->RegisterPostEncodeImageCallback(post_encode_callback);
+}
+
 QMVideoSettingsCallback::QMVideoSettingsCallback(VideoProcessing* vpm)
     : vp_(vpm) {
 }