OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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_MEDIA_BASE_FAKEVIDEORENDERER_H_ | 11 #ifndef WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ |
12 #define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ | 12 #define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ |
13 | 13 |
14 #include "webrtc/base/logging.h" | 14 #include "webrtc/base/logging.h" |
15 #include "webrtc/base/sigslot.h" | 15 #include "webrtc/base/sigslot.h" |
16 #include "webrtc/media/base/videoframe.h" | 16 #include "webrtc/media/base/videoframe.h" |
17 #include "webrtc/media/base/videorenderer.h" | 17 #include "webrtc/media/base/videosinkinterface.h" |
18 | 18 |
19 namespace cricket { | 19 namespace cricket { |
20 | 20 |
21 // Faked video renderer that has a callback for actions on rendering. | 21 // Faked video renderer that has a callback for actions on rendering. |
22 class FakeVideoRenderer : public VideoRenderer { | 22 class FakeVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> { |
23 public: | 23 public: |
24 FakeVideoRenderer() | 24 FakeVideoRenderer() |
25 : errors_(0), | 25 : errors_(0), |
26 width_(0), | 26 width_(0), |
27 height_(0), | 27 height_(0), |
28 rotation_(webrtc::kVideoRotation_0), | 28 rotation_(webrtc::kVideoRotation_0), |
29 timestamp_(0), | 29 timestamp_(0), |
30 num_rendered_frames_(0), | 30 num_rendered_frames_(0), |
31 black_frame_(false) {} | 31 black_frame_(false) {} |
32 | 32 |
33 virtual bool RenderFrame(const VideoFrame* frame) { | 33 virtual void OnFrame(const VideoFrame& frame) { |
34 rtc::CritScope cs(&crit_); | 34 rtc::CritScope cs(&crit_); |
35 // TODO(zhurunz) Check with VP8 team to see if we can remove this | 35 // TODO(zhurunz) Check with VP8 team to see if we can remove this |
36 // tolerance on Y values. | 36 // tolerance on Y values. |
37 black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, frame); | 37 black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, &frame); |
38 // Treat unexpected frame size as error. | 38 // Treat unexpected frame size as error. |
39 if (!frame) { | |
40 LOG(LS_WARNING) << "RenderFrame expected non-null frame."; | |
41 ++errors_; | |
42 return false; | |
43 } | |
44 ++num_rendered_frames_; | 39 ++num_rendered_frames_; |
45 width_ = static_cast<int>(frame->GetWidth()); | 40 width_ = static_cast<int>(frame.GetWidth()); |
46 height_ = static_cast<int>(frame->GetHeight()); | 41 height_ = static_cast<int>(frame.GetHeight()); |
47 rotation_ = frame->GetVideoRotation(); | 42 rotation_ = frame.GetVideoRotation(); |
48 timestamp_ = frame->GetTimeStamp(); | 43 timestamp_ = frame.GetTimeStamp(); |
49 SignalRenderFrame(frame); | 44 SignalRenderFrame(&frame); |
50 return true; | |
51 } | 45 } |
52 | 46 |
53 int errors() const { return errors_; } | 47 int errors() const { return errors_; } |
54 int width() const { | 48 int width() const { |
55 rtc::CritScope cs(&crit_); | 49 rtc::CritScope cs(&crit_); |
56 return width_; | 50 return width_; |
57 } | 51 } |
58 int height() const { | 52 int height() const { |
59 rtc::CritScope cs(&crit_); | 53 rtc::CritScope cs(&crit_); |
60 return height_; | 54 return height_; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 webrtc::VideoRotation rotation_; | 132 webrtc::VideoRotation rotation_; |
139 int64_t timestamp_; | 133 int64_t timestamp_; |
140 int num_rendered_frames_; | 134 int num_rendered_frames_; |
141 bool black_frame_; | 135 bool black_frame_; |
142 rtc::CriticalSection crit_; | 136 rtc::CriticalSection crit_; |
143 }; | 137 }; |
144 | 138 |
145 } // namespace cricket | 139 } // namespace cricket |
146 | 140 |
147 #endif // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ | 141 #endif // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_ |
OLD | NEW |