Index: webrtc/media/engine/webrtcvideoengine2.h |
diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h |
index 27eadb299ae69160ba7d9a41ca38c74463f4b691..e583a54594c9e026e9efe8c1f060043d5c319fef 100644 |
--- a/webrtc/media/engine/webrtcvideoengine2.h |
+++ b/webrtc/media/engine/webrtcvideoengine2.h |
@@ -31,7 +31,6 @@ |
#include "webrtc/transport.h" |
#include "webrtc/video_frame.h" |
#include "webrtc/video_receive_stream.h" |
-#include "webrtc/video_renderer.h" |
#include "webrtc/video_send_stream.h" |
namespace webrtc { |
@@ -394,8 +393,10 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { |
// Wrapper for the receiver part, contains configs etc. that are needed to |
// reconstruct the underlying VideoReceiveStream. Also serves as a wrapper |
- // between webrtc::VideoRenderer and cricket::VideoRenderer. |
- class WebRtcVideoReceiveStream : public webrtc::VideoRenderer { |
+ // between rtc::VideoSinkInterface<webrtc::VideoFrame> and |
+ // cricket::VideoRenderer. |
perkj_webrtc
2016/03/22 08:43:44
Not true. cricket::VIdeoRenderer is no more.
nisse-webrtc
2016/03/22 10:47:14
I'm updating the comment. cricket::VideoRenderer i
|
+ class WebRtcVideoReceiveStream |
+ : public rtc::VideoSinkInterface<webrtc::VideoFrame> { |
public: |
WebRtcVideoReceiveStream( |
webrtc::Call* call, |
@@ -403,8 +404,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { |
const webrtc::VideoReceiveStream::Config& config, |
WebRtcVideoDecoderFactory* external_decoder_factory, |
bool default_stream, |
- const std::vector<VideoCodecSettings>& recv_codecs, |
- bool disable_prerenderer_smoothing); |
+ const std::vector<VideoCodecSettings>& recv_codecs); |
~WebRtcVideoReceiveStream(); |
const std::vector<uint32_t>& GetSsrcs() const; |
@@ -418,7 +418,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { |
void SetRecvParameters(const ChangedRecvParameters& recv_params); |
void OnFrame(const webrtc::VideoFrame& frame) override; |
- bool SmoothsRenderedFrames() const override; |
bool IsDefaultStream() const; |
void SetSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink); |
@@ -459,8 +458,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { |
WebRtcVideoDecoderFactory* const external_decoder_factory_; |
std::vector<AllocatedDecoder> allocated_decoders_; |
- const bool disable_prerenderer_smoothing_; |
- |
rtc::CriticalSection sink_lock_; |
rtc::VideoSinkInterface<cricket::VideoFrame>* sink_ GUARDED_BY(sink_lock_); |
int last_width_ GUARDED_BY(sink_lock_); |