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

Side by Side Diff: webrtc/api/test/fakevideotrackrenderer.h

Issue 1684423002: Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Additional test. Addressed nits. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_ 11 #ifndef WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_
12 #define WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_ 12 #define WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_
13 13
14 #include "webrtc/api/mediastreaminterface.h" 14 #include "webrtc/api/mediastreaminterface.h"
15 #include "webrtc/media/base/fakevideorenderer.h" 15 #include "webrtc/media/base/fakevideorenderer.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 class FakeVideoTrackRenderer : public VideoRendererInterface { 19 class FakeVideoTrackRenderer
20 : public rtc::VideoSinkInterface<cricket::VideoFrame> {
20 public: 21 public:
21 FakeVideoTrackRenderer(VideoTrackInterface* video_track) 22 FakeVideoTrackRenderer(VideoTrackInterface* video_track)
22 : video_track_(video_track), last_frame_(NULL) { 23 : video_track_(video_track), last_frame_(NULL) {
24 video_track_->AddOrUpdateSink(this, rtc::VideoSinkWants());
25 }
26 ~FakeVideoTrackRenderer() { video_track_->RemoveSink(this); }
27
28 virtual void OnFrame(const cricket::VideoFrame& video_frame) override {
29 last_frame_ = const_cast<cricket::VideoFrame*>(&video_frame);
30 fake_renderer_.RenderFrame(&video_frame);
31 }
32
33 int errors() const { return fake_renderer_.errors(); }
34 int width() const { return fake_renderer_.width(); }
35 int height() const { return fake_renderer_.height(); }
36 bool black_frame() const { return fake_renderer_.black_frame(); }
37
38 int num_rendered_frames() const {
39 return fake_renderer_.num_rendered_frames();
40 }
41 const cricket::VideoFrame* last_frame() const { return last_frame_; }
42
43 private:
44 cricket::FakeVideoRenderer fake_renderer_;
45 rtc::scoped_refptr<VideoTrackInterface> video_track_;
46
47 // Weak reference for frame pointer comparison only.
48 cricket::VideoFrame* last_frame_;
49 };
50
51 // Similar class, using the deprecated AddRenderer/RemoveRenderer methods.
52 class FakeVideoTrackRendererOld : public VideoRendererInterface {
53 public:
54 FakeVideoTrackRendererOld(VideoTrackInterface* video_track)
55 : video_track_(video_track), last_frame_(NULL) {
23 video_track_->AddRenderer(this); 56 video_track_->AddRenderer(this);
24 } 57 }
25 ~FakeVideoTrackRenderer() { 58 ~FakeVideoTrackRendererOld() { video_track_->RemoveRenderer(this); }
26 video_track_->RemoveRenderer(this);
27 }
28 59
29 virtual void RenderFrame(const cricket::VideoFrame* video_frame) override { 60 virtual void RenderFrame(const cricket::VideoFrame* video_frame) override {
30 last_frame_ = const_cast<cricket::VideoFrame*>(video_frame); 61 last_frame_ = const_cast<cricket::VideoFrame*>(video_frame);
31 fake_renderer_.RenderFrame(video_frame); 62 fake_renderer_.RenderFrame(video_frame);
32 } 63 }
33 64
34 int errors() const { return fake_renderer_.errors(); } 65 int errors() const { return fake_renderer_.errors(); }
35 int width() const { return fake_renderer_.width(); } 66 int width() const { return fake_renderer_.width(); }
36 int height() const { return fake_renderer_.height(); } 67 int height() const { return fake_renderer_.height(); }
37 bool black_frame() const { return fake_renderer_.black_frame(); } 68 bool black_frame() const { return fake_renderer_.black_frame(); }
38 69
39 int num_rendered_frames() const { 70 int num_rendered_frames() const {
40 return fake_renderer_.num_rendered_frames(); 71 return fake_renderer_.num_rendered_frames();
41 } 72 }
42 const cricket::VideoFrame* last_frame() const { return last_frame_; } 73 const cricket::VideoFrame* last_frame() const { return last_frame_; }
43 74
44 private: 75 private:
45 cricket::FakeVideoRenderer fake_renderer_; 76 cricket::FakeVideoRenderer fake_renderer_;
46 rtc::scoped_refptr<VideoTrackInterface> video_track_; 77 rtc::scoped_refptr<VideoTrackInterface> video_track_;
47 78
48 // Weak reference for frame pointer comparison only. 79 // Weak reference for frame pointer comparison only.
49 cricket::VideoFrame* last_frame_; 80 cricket::VideoFrame* last_frame_;
50 }; 81 };
51 82
52 } // namespace webrtc 83 } // namespace webrtc
53 84
54 #endif // WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_ 85 #endif // WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698