| Index: talk/media/base/fakevideorenderer.h
|
| diff --git a/talk/media/base/fakevideorenderer.h b/talk/media/base/fakevideorenderer.h
|
| index c6a1c2468dc1dbcf73085ac579880c9d5941b14b..d1e736e69c343ece1fb7d8ed5057aa25c7a2b5e5 100644
|
| --- a/talk/media/base/fakevideorenderer.h
|
| +++ b/talk/media/base/fakevideorenderer.h
|
| @@ -42,40 +42,24 @@ class FakeVideoRenderer : public VideoRenderer {
|
| : errors_(0),
|
| width_(0),
|
| height_(0),
|
| - num_set_sizes_(0),
|
| num_rendered_frames_(0),
|
| black_frame_(false) {
|
| }
|
|
|
| - virtual bool SetSize(int width, int height, int reserved) {
|
| - rtc::CritScope cs(&crit_);
|
| - width_ = width;
|
| - height_ = height;
|
| - ++num_set_sizes_;
|
| - SignalSetSize(width, height, reserved);
|
| - return true;
|
| - }
|
| -
|
| virtual bool RenderFrame(const VideoFrame* frame) {
|
| rtc::CritScope cs(&crit_);
|
| // TODO(zhurunz) Check with VP8 team to see if we can remove this
|
| // tolerance on Y values.
|
| black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, frame);
|
| // Treat unexpected frame size as error.
|
| - if (!frame ||
|
| - frame->GetWidth() != static_cast<size_t>(width_) ||
|
| - frame->GetHeight() != static_cast<size_t>(height_)) {
|
| - if (!frame) {
|
| - LOG(LS_WARNING) << "RenderFrame expected non-null frame.";
|
| - } else {
|
| - LOG(LS_WARNING) << "RenderFrame expected frame of size " << width_
|
| - << "x" << height_ << " but received frame of size "
|
| - << frame->GetWidth() << "x" << frame->GetHeight();
|
| - }
|
| + if (!frame) {
|
| + LOG(LS_WARNING) << "RenderFrame expected non-null frame.";
|
| ++errors_;
|
| return false;
|
| }
|
| ++num_rendered_frames_;
|
| + width_ = static_cast<int>(frame->GetWidth());
|
| + height_ = static_cast<int>(frame->GetHeight());
|
| SignalRenderFrame(frame);
|
| return true;
|
| }
|
| @@ -89,10 +73,6 @@ class FakeVideoRenderer : public VideoRenderer {
|
| rtc::CritScope cs(&crit_);
|
| return height_;
|
| }
|
| - int num_set_sizes() const {
|
| - rtc::CritScope cs(&crit_);
|
| - return num_set_sizes_;
|
| - }
|
| int num_rendered_frames() const {
|
| rtc::CritScope cs(&crit_);
|
| return num_rendered_frames_;
|
| @@ -160,7 +140,6 @@ class FakeVideoRenderer : public VideoRenderer {
|
| int errors_;
|
| int width_;
|
| int height_;
|
| - int num_set_sizes_;
|
| int num_rendered_frames_;
|
| bool black_frame_;
|
| mutable rtc::CriticalSection crit_;
|
|
|