Revert of move deprected functions from EncodedImageCallback and RtpRtcp

webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm

Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm
index 538734b0f42537aaf3f3f2b9b0b159edf97f96ae..8276448e2cdcdf91085d0003e6bde2eab117bda5 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm
+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm
@@ -650,10 +650,9 @@ void H264VideoToolboxEncoder::OnEncodedFrame(
     quality_scaler_.ReportQP(qp);
   }
 
-  EncodedImageCallback::Result result =
-      callback_->OnEncodedImage(frame, &codec_specific_info, header.get());
-  if (result.error != EncodedImageCallback::Result::OK) {
-    LOG(LS_ERROR) << "Encode callback failed: " << result.error;
+  int result = callback_->Encoded(frame, &codec_specific_info, header.get());
+  if (result != 0) {
+    LOG(LS_ERROR) << "Encode callback failed: " << result;
     return;
   }
   bitrate_adjuster_.Update(frame._size);