Revert of Remove deprected functions from EncodedImageCallback and RtpRtcp

webrtc/video_encoder.h

Index: webrtc/video_encoder.h
diff --git a/webrtc/video_encoder.h b/webrtc/video_encoder.h
index 8bfa72fe1ef47e83ec38961ef5f01e4dbb7b0edf..d8b7921bc07fad057cfc438021c41c6219b134a6 100644
--- a/webrtc/video_encoder.h
+++ b/webrtc/video_encoder.h
@@ -54,10 +54,23 @@ class EncodedImageCallback {
   };
 
   // Callback function which is called when an image has been encoded.
-  virtual Result OnEncodedImage(
-      const EncodedImage& encoded_image,
-      const CodecSpecificInfo* codec_specific_info,
-      const RTPFragmentationHeader* fragmentation) = 0;
+  virtual Result OnEncodedImage(const EncodedImage& encoded_image,
+                                const CodecSpecificInfo* codec_specific_info,
+                                const RTPFragmentationHeader* fragmentation) {
+    return (Encoded(encoded_image, codec_specific_info, fragmentation) == 0)
+               ? Result(Result::OK, 0)
+               : Result(Result::ERROR_SEND_FAILED);
+  }
+
+  // DEPRECATED.
+  // TODO(sergeyu): Remove this method.
+  virtual int32_t Encoded(const EncodedImage& encoded_image,
+                          const CodecSpecificInfo* codec_specific_info,
+                          const RTPFragmentationHeader* fragmentation) {
+    Result result =
+        OnEncodedImage(encoded_image, codec_specific_info, fragmentation);
+    return (result.error != Result::OK) ? -1 : (result.drop_next_frame ? 1 : 0);
+  }
 };
 
 class VideoEncoder {