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

Unified Diff: webrtc/common_video/incoming_video_stream.cc

Issue 2032003002: Minor cleanup in IncomingVideoStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/common_video/include/incoming_video_stream.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/common_video/incoming_video_stream.cc
diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc
index 5fc8eae0bd570ae4c52f335c0d383a2c182f4361..37594e7aa3af4e3c5e1c83ddf860abd779ef6297 100644
--- a/webrtc/common_video/incoming_video_stream.cc
+++ b/webrtc/common_video/incoming_video_stream.cc
@@ -12,22 +12,11 @@
#include <assert.h>
-#if defined(_WIN32)
-#include <windows.h>
-#elif defined(WEBRTC_LINUX)
-#include <sys/time.h>
-#include <time.h>
-#else
-#include <sys/time.h>
-#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<VideoFrame>* render_callback) {
- rtc::CritScope cs(&thread_critsect_);
- render_callback_ = render_callback;
-}
-
int32_t IncomingVideoStream::SetExpectedRenderDelay(
int32_t delay_ms) {
rtc::CritScope csS(&stream_critsect_);
@@ -204,8 +186,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);
}
}
« no previous file with comments | « webrtc/common_video/include/incoming_video_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698