Delete VideoReceiveStream::Config::pre_render_callback.

webrtc/video/video_stream_decoder.h

 /*
  *  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 11 matching lines @@
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class CallStatsObserver;
 class ChannelStatsObserver;
 class EncodedImageCallback;
-class I420FrameCallback;
 class ReceiveStatisticsProxy;
 class VideoRenderCallback;
 
 namespace vcm {
 class VideoReceiver;
 }  // namespace vcm
 
 enum StreamType {
   kViEStreamTypeNormal = 0,  // Normal media stream
   kViEStreamTypeRtx = 1      // Retransmission media stream
 };
 
 class VideoStreamDecoder : public VCMReceiveCallback,
                            public VCMReceiveStatisticsCallback,
                            public VCMDecoderTimingCallback,
                            public CallStatsObserver {
  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.
   int32_t FrameToRender(VideoFrame& video_frame,
                         rtc::Optional<uint8_t> qp) override;
   int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
   void OnIncomingPayloadType(int payload_type) override;
   void OnDecoderImplementationName(const char* implementation_name) override;
 
   // Implements VCMReceiveStatisticsCallback.
@@ skipping 26 matching lines @@
 
  private:
   // Used for all registered callbacks except rendering.
   rtc::CriticalSection crit_;
 
   vcm::VideoReceiver* const video_receiver_;
 
   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_;
-
   int64_t last_rtt_ms_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_