Remove PayloadRouter dependency from ViEEncoder

webrtc/video/video_send_stream.h

Index: webrtc/video/video_send_stream.h
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index ad438ae0cb47580a7a3cba1d346b8965372e81ec..7b45140adadae536e0eec16e3a19a96981f8076d 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -48,7 +48,8 @@ namespace internal {
 class VideoSendStream : public webrtc::VideoSendStream,
                         public webrtc::CpuOveruseObserver,
                         public webrtc::BitrateAllocatorObserver,
-                        public webrtc::VCMProtectionCallback {
+                        public webrtc::VCMProtectionCallback,
+                        protected webrtc::EncodedImageCallback {
  public:
   VideoSendStream(int num_cpu_cores,
                   ProcessThread* module_process_thread,
@@ -99,6 +100,14 @@ class VideoSendStream : public webrtc::VideoSendStream,
     VideoCodec video_codec;
     int min_transmit_bitrate_bps;
   };
+
+  // Implements EncodedImageCallback. The implementation routes encoded frames
+  // to the |payload_router_| and |config.pre_encode_callback| if set.
+  // Called on an arbitrary encoder callback thread.
+  int32_t Encoded(const EncodedImage& encoded_image,
+                  const CodecSpecificInfo* codec_specific_info,
+                  const RTPFragmentationHeader* fragmentation) override;
+
   static bool EncoderThreadFunction(void* obj);
   void EncoderProcess();