Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(979)

Unified Diff: webrtc/video/video_stream_decoder.h

Issue 2678343002: Delete VideoReceiveStream::Config::pre_render_callback. (Closed)
Patch Set: Rebased. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_stream_decoder.h
diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h
index be2c9388870fc979376a2f58188e81733e7cb2bf..270c16b986a17e20e7f2f29fe016cc15e27b1443 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.
@@ -103,10 +102,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_;
-
int64_t last_rtt_ms_ GUARDED_BY(crit_);
};
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/video_stream_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698