Delete VideoReceiveStream::Config::pre_render_callback.

webrtc/video/video_stream_decoder.h

Index: webrtc/video/video_stream_decoder.h
diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h
index 14ad071f4a8620036cc767ddf55b124dc228a68e..10acd24efdf9dcd4f740b890c99e2b0608570a1a 100644
--- a/webrtc/video/video_stream_decoder.h
+++ b/webrtc/video/video_stream_decoder.h
@@ -29,7 +29,6 @@ namespace webrtc {
 class CallStatsObserver;
 class ChannelStatsObserver;
 class EncodedImageCallback;
-class I420FrameCallback;
 class ReceiveStatisticsProxy;
 class VideoRenderCallback;
 
@@ -49,14 +48,14 @@ class VideoStreamDecoder : public VCMReceiveCallback,
  public:
   friend class ChannelStatsObserver;
 
-  VideoStreamDecoder(vcm::VideoReceiver* video_receiver,
-                     VCMFrameTypeCallback* vcm_frame_type_callback,
-                     VCMPacketRequestCallback* vcm_packet_request_callback,
-                     bool enable_nack,
-                     bool enable_fec,
-                     ReceiveStatisticsProxy* receive_statistics_proxy,
-                     rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream,
-                     I420FrameCallback* pre_render_callback);
+  VideoStreamDecoder(
+      vcm::VideoReceiver* video_receiver,
+      VCMFrameTypeCallback* vcm_frame_type_callback,
+      VCMPacketRequestCallback* vcm_packet_request_callback,
+      bool enable_nack,
+      bool enable_fec,
+      ReceiveStatisticsProxy* receive_statistics_proxy,
+      rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream);
   ~VideoStreamDecoder();
 
   // Implements VCMReceiveCallback.
@@ -102,10 +101,6 @@ class VideoStreamDecoder : public VCMReceiveCallback,
   ReceiveStatisticsProxy* const receive_stats_callback_;
   rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_;
 
-  // TODO(tommi): This callback is basically the same thing as the one above.
-  // We shouldn't need to support both.
-  I420FrameCallback* const pre_render_callback_;

[tommi, 2017/02/07 11:58:20]

w00t! :D thanks for removing this

[nisse-webrtc, 2017/02/07 13:30:59]

My pleasure ;-)

-
   int64_t last_rtt_ms_ GUARDED_BY(crit_);
 };