diff --git a/webrtc/common_video/include/incoming_video_stream.h b/webrtc/common_video/include/incoming_video_stream.h index 32e3184ce9..40f35fe005 100644 --- a/webrtc/common_video/include/incoming_video_stream.h +++ b/webrtc/common_video/include/incoming_video_stream.h @@ -31,9 +31,6 @@ class IncomingVideoStream : public rtc::VideoSinkInterface { // Overrides VideoSinkInterface void OnFrame(const VideoFrame& video_frame) override; - // Set callback to the platform dependent code. - void SetRenderCallback(rtc::VideoSinkInterface* render_callback); - // Callback for file recording, snapshot, ... void SetExternalCallback(rtc::VideoSinkInterface* render_object); @@ -74,8 +71,6 @@ class IncomingVideoStream : public rtc::VideoSinkInterface { bool running_ GUARDED_BY(stream_critsect_); rtc::VideoSinkInterface* external_callback_ GUARDED_BY(thread_critsect_); - rtc::VideoSinkInterface* render_callback_ - GUARDED_BY(thread_critsect_); const std::unique_ptr render_buffers_ GUARDED_BY(buffer_critsect_); diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc index 7bc24861b8..dce1a7fca4 100644 --- a/webrtc/common_video/incoming_video_stream.cc +++ b/webrtc/common_video/incoming_video_stream.cc @@ -12,22 +12,11 @@ #include -#if defined(_WIN32) -#include -#elif defined(WEBRTC_LINUX) -#include -#include -#else -#include -#endif - #include "webrtc/base/platform_thread.h" #include "webrtc/base/timeutils.h" -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/video_render_frames.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" -#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { @@ -37,7 +26,6 @@ IncomingVideoStream::IncomingVideoStream(bool disable_prerenderer_smoothing) deliver_buffer_event_(EventTimerWrapper::Create()), running_(false), external_callback_(nullptr), - render_callback_(nullptr), render_buffers_(new VideoRenderFrames()), incoming_rate_(0), last_rate_calculation_time_ms_(0), @@ -76,12 +64,6 @@ void IncomingVideoStream::OnFrame(const VideoFrame& video_frame) { } } -void IncomingVideoStream::SetRenderCallback( - rtc::VideoSinkInterface* render_callback) { - rtc::CritScope cs(&thread_critsect_); - render_callback_ = render_callback; -} - int32_t IncomingVideoStream::SetExpectedRenderDelay( int32_t delay_ms) { rtc::CritScope csS(&stream_critsect_); @@ -201,8 +183,6 @@ void IncomingVideoStream::DeliverFrame(const VideoFrame& video_frame) { // Send frame for rendering. if (external_callback_) { external_callback_->OnFrame(video_frame); - } else if (render_callback_) { - render_callback_->OnFrame(video_frame); } }