diff options
author | guoweis@webrtc.org <guoweis@webrtc.org> | 2015-03-10 06:37:00 +0000 |
---|---|---|
committer | guoweis@webrtc.org <guoweis@webrtc.org> | 2015-03-10 06:37:41 +0000 |
commit | f9a75d99b92402c56744121b7bc991a9c71cf324 (patch) | |
tree | 5043613c105583e84a974b699b35ea80c0ebfb7c /talk/app/webrtc/test | |
parent | 60a2aa06527d3cb7f215d2c3e6284d92af7cf6fd (diff) | |
download | webrtc-f9a75d99b92402c56744121b7bc991a9c71cf324.tar.gz |
Revert "Add concept of whether video renderer supports rotation."
This reverts commit 0ad48935fc5b92be6e10924a9ee3b0dc39c79104.
TBR=guoweis@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/41199004
Cr-Commit-Position: refs/heads/master@{#8663}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8663 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/test')
-rw-r--r-- | talk/app/webrtc/test/fakevideotrackrenderer.h | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/talk/app/webrtc/test/fakevideotrackrenderer.h b/talk/app/webrtc/test/fakevideotrackrenderer.h index 8bd98fa8a9..d636a56808 100644 --- a/talk/app/webrtc/test/fakevideotrackrenderer.h +++ b/talk/app/webrtc/test/fakevideotrackrenderer.h @@ -35,55 +35,34 @@ namespace webrtc { class FakeVideoTrackRenderer : public VideoRendererInterface { public: - FakeVideoTrackRenderer(VideoTrackInterface* video_track) - : video_track_(video_track), - can_apply_rotation_(true), - last_frame_(NULL) { - video_track_->AddRenderer(this); - } - FakeVideoTrackRenderer(VideoTrackInterface* video_track, - bool can_apply_rotation) - : video_track_(video_track), - can_apply_rotation_(can_apply_rotation), - last_frame_(NULL) { + explicit FakeVideoTrackRenderer(VideoTrackInterface* video_track) + : video_track_(video_track) { video_track_->AddRenderer(this); } ~FakeVideoTrackRenderer() { video_track_->RemoveRenderer(this); } - virtual void RenderFrame(const cricket::VideoFrame* video_frame) override { - last_frame_ = const_cast<cricket::VideoFrame*>(video_frame); - - const cricket::VideoFrame* frame = - can_apply_rotation_ ? video_frame - : video_frame->GetCopyWithRotationApplied(); - - if (!fake_renderer_.SetSize(static_cast<int>(frame->GetWidth()), - static_cast<int>(frame->GetHeight()), 0)) { - return; - } + // Implements VideoRendererInterface + virtual void SetSize(int width, int height) { + fake_renderer_.SetSize(width, height, 0); + } + virtual void RenderFrame(const cricket::VideoFrame* frame) { fake_renderer_.RenderFrame(frame); } - virtual bool CanApplyRotation() override { return can_apply_rotation_; } - int errors() const { return fake_renderer_.errors(); } int width() const { return fake_renderer_.width(); } int height() const { return fake_renderer_.height(); } + int num_set_sizes() const { return fake_renderer_.num_set_sizes(); } int num_rendered_frames() const { return fake_renderer_.num_rendered_frames(); } - const cricket::VideoFrame* last_frame() const { return last_frame_; } private: cricket::FakeVideoRenderer fake_renderer_; rtc::scoped_refptr<VideoTrackInterface> video_track_; - bool can_apply_rotation_; - - // Weak reference for frame pointer comparison only. - cricket::VideoFrame* last_frame_; }; } // namespace webrtc |