Revert of move deprected functions from EncodedImageCallback and RtpRtcp

webrtc/modules/video_coding/codecs/i420/i420.cc

 /*
  *  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 98 matching lines @@
   uint8_t* buffer = _encodedImage._buffer;
 
   buffer = InsertHeader(buffer, width, height);
 
   int ret_length =
       ExtractBuffer(inputImage, req_length - kI420HeaderSize, buffer);
   if (ret_length < 0)
     return WEBRTC_VIDEO_CODEC_MEMORY;
   _encodedImage._length = ret_length + kI420HeaderSize;
 
-  _encodedCompleteCallback->OnEncodedImage(_encodedImage, nullptr, nullptr);
-
+  _encodedCompleteCallback->Encoded(_encodedImage, NULL, NULL);
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 uint8_t* I420Encoder::InsertHeader(uint8_t* buffer,
                                    uint16_t width,
                                    uint16_t height) {
   *buffer++ = static_cast<uint8_t>(width >> 8);
   *buffer++ = static_cast<uint8_t>(width & 0xFF);
   *buffer++ = static_cast<uint8_t>(height >> 8);
   *buffer++ = static_cast<uint8_t>(height & 0xFF);
@@ skipping 99 matching lines @@
     DecodedImageCallback* callback) {
   _decodeCompleteCallback = callback;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int I420Decoder::Release() {
   _inited = false;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 }  // namespace webrtc