admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused render callback method+pointer in IncomingVideoStream.

Browse Source 
Review-Url: https://codereview.webrtc.org/2032003002
Cr-Commit-Position: refs/heads/master@{#13009}
This commit is contained in:
mflodman 2016-06-02 02:39:05 -07:00 committed by Commit bot
parent 26306b139a
commit 5724b7317e
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/common_video/include/incoming_video_stream.h
View File

@ -31,9 +31,6 @@ class IncomingVideoStream : public rtc::VideoSinkInterface<VideoFrame> {
// Overrides VideoSinkInterface // Overrides VideoSinkInterface
void OnFrame(const VideoFrame& video_frame) override; void OnFrame(const VideoFrame& video_frame) override;
// Set callback to the platform dependent code.
void SetRenderCallback(rtc::VideoSinkInterface<VideoFrame>* render_callback);
// Callback for file recording, snapshot, ... // Callback for file recording, snapshot, ...
void SetExternalCallback(rtc::VideoSinkInterface<VideoFrame>* render_object); void SetExternalCallback(rtc::VideoSinkInterface<VideoFrame>* render_object);
@ -74,8 +71,6 @@ class IncomingVideoStream : public rtc::VideoSinkInterface<VideoFrame> {
bool running_ GUARDED_BY(stream_critsect_); bool running_ GUARDED_BY(stream_critsect_);
rtc::VideoSinkInterface<VideoFrame>* external_callback_ rtc::VideoSinkInterface<VideoFrame>* external_callback_
GUARDED_BY(thread_critsect_); GUARDED_BY(thread_critsect_);
rtc::VideoSinkInterface<VideoFrame>* render_callback_
GUARDED_BY(thread_critsect_);
const std::unique_ptr<VideoRenderFrames> render_buffers_ const std::unique_ptr<VideoRenderFrames> render_buffers_
GUARDED_BY(buffer_critsect_); GUARDED_BY(buffer_critsect_);

20
webrtc/common_video/incoming_video_stream.cc
View File

@ -12,22 +12,11 @@
#include <assert.h> #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/platform_thread.h"
#include "webrtc/base/timeutils.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/common_video/video_render_frames.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
namespace webrtc { namespace webrtc {
@ -37,7 +26,6 @@ IncomingVideoStream::IncomingVideoStream(bool disable_prerenderer_smoothing)
deliver_buffer_event_(EventTimerWrapper::Create()), deliver_buffer_event_(EventTimerWrapper::Create()),
running_(false), running_(false),
external_callback_(nullptr), external_callback_(nullptr),
render_callback_(nullptr),
render_buffers_(new VideoRenderFrames()), render_buffers_(new VideoRenderFrames()),
incoming_rate_(0), incoming_rate_(0),
last_rate_calculation_time_ms_(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 IncomingVideoStream::SetExpectedRenderDelay(
int32_t delay_ms) { int32_t delay_ms) {
rtc::CritScope csS(&stream_critsect_); rtc::CritScope csS(&stream_critsect_);
@ -201,8 +183,6 @@ void IncomingVideoStream::DeliverFrame(const VideoFrame& video_frame) {
// Send frame for rendering. // Send frame for rendering.
if (external_callback_) { if (external_callback_) {
external_callback_->OnFrame(video_frame); external_callback_->OnFrame(video_frame);
} else if (render_callback_) {
render_callback_->OnFrame(video_frame);
} }
} }