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

Add default dummy implementation of cricket::VideoRenderer::SetSize, to easy later removal.

Browse Source 
BUG=webrtc:5426

Review URL: https://codereview.webrtc.org/1581583002

Cr-Commit-Position: refs/heads/master@{#11218}
This commit is contained in:
nisse 2016-01-12 03:39:14 -08:00 committed by Commit bot
parent 16979e35b3
commit 127782bbb1
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/videosource.cc
View File

@ -304,8 +304,6 @@ class FrameInputWrapper : public cricket::VideoRenderer {
virtual ~FrameInputWrapper() {}
// VideoRenderer implementation.
bool SetSize(int width, int height, int reserved) override { return true; }
bool RenderFrame(const cricket::VideoFrame* frame) override {
if (!capturer_->IsRunning()) {
return true;

4
talk/app/webrtc/videotrackrenderers.cc
View File

@ -54,10 +54,6 @@ void VideoTrackRenderers::SetEnabled(bool enable) {
enabled_ = enable;
}
bool VideoTrackRenderers::SetSize(int width, int height, int reserved) {
return true;
}
bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) {
rtc::CritScope cs(&critical_section_);
if (!enabled_) {

1
talk/app/webrtc/videotrackrenderers.h
View File

@ -48,7 +48,6 @@ class VideoTrackRenderers : public cricket::VideoRenderer {
~VideoTrackRenderers();
// Implements cricket::VideoRenderer
virtual bool SetSize(int width, int height, int reserved);
virtual bool RenderFrame(const cricket::VideoFrame* frame);
void AddRenderer(VideoRendererInterface* renderer);

11
talk/media/base/videorenderer.h
View File

@ -42,11 +42,12 @@ class VideoFrame;
class VideoRenderer {
public:
virtual ~VideoRenderer() {}
// Called when the video has changed size. This is also used as an
// initialization method to set the UI size before any video frame
// rendered. webrtc::ExternalRenderer's FrameSizeChange will invoke this when
// it's called or later when a VideoRenderer is attached.
virtual bool SetSize(int width, int height, int reserved) = 0;
// Called when the video has changed size.
// TODO(nisse): This method is not really used, and should be
// deleted. Provide a default do-nothing implementation, to easy the
// transition as the method is deleted in subclasses, in particular,
// chrome's MockVideoRenderer class.
virtual bool SetSize(int width, int height, int reserved) { return true; };
// Called when a new frame is available for display.
virtual bool RenderFrame(const VideoFrame *frame) = 0;