Reland of move deprected functions from EncodedImageCallback and RtpRtcp

webrtc/video_encoder.h

 /*
  *  Copyright (c) 2014 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 36 matching lines @@
     // seen by the receiver for this frame. RTP timestamp of the frame is used
     // as frame ID when RTP is used to send video. Must be used only when
     // error=OK.
     uint32_t frame_id = 0;
 
     // Tells the encoder that the next frame is should be dropped.
     bool drop_next_frame = false;
   };
 
   // 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) {
-    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);
-  }
+  virtual Result OnEncodedImage(
+      const EncodedImage& encoded_image,
+      const CodecSpecificInfo* codec_specific_info,
+      const RTPFragmentationHeader* fragmentation) = 0;
 };
 
 class VideoEncoder {
  public:
   enum EncoderType {
     kH264,
     kVp8,
     kVp9,
     kUnsupportedCodec,
   };
@@ skipping 131 matching lines @@
 
   const EncoderType encoder_type_;
   webrtc::VideoEncoder* const encoder_;
 
   std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
   std::string fallback_implementation_name_;
   EncodedImageCallback* callback_;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_ENCODER_H_