OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 10 matching lines...) Expand all Loading... |
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #include <string> | 28 #include <string> |
29 | 29 |
30 #include "talk/app/webrtc/remotevideocapturer.h" | 30 #include "talk/app/webrtc/remotevideocapturer.h" |
31 #include "talk/media/webrtc/webrtcvideoframe.h" | |
32 #include "webrtc/base/gunit.h" | 31 #include "webrtc/base/gunit.h" |
| 32 #include "webrtc/media/webrtc/webrtcvideoframe.h" |
33 | 33 |
34 using cricket::CaptureState; | 34 using cricket::CaptureState; |
35 using cricket::VideoCapturer; | 35 using cricket::VideoCapturer; |
36 using cricket::VideoFormat; | 36 using cricket::VideoFormat; |
37 using cricket::VideoFormatPod; | 37 using cricket::VideoFormatPod; |
38 using cricket::VideoFrame; | 38 using cricket::VideoFrame; |
39 | 39 |
40 static const int kMaxWaitMs = 1000; | 40 static const int kMaxWaitMs = 1000; |
41 static const VideoFormatPod kTestFormat = | 41 static const VideoFormatPod kTestFormat = |
42 {640, 480, FPS_TO_INTERVAL(30), cricket::FOURCC_ANY}; | 42 {640, 480, FPS_TO_INTERVAL(30), cricket::FOURCC_ANY}; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 | 123 |
124 TEST_F(RemoteVideoCapturerTest, InputFrame) { | 124 TEST_F(RemoteVideoCapturerTest, InputFrame) { |
125 EXPECT_EQ(0, captured_frame_num()); | 125 EXPECT_EQ(0, captured_frame_num()); |
126 | 126 |
127 cricket::WebRtcVideoFrame test_frame; | 127 cricket::WebRtcVideoFrame test_frame; |
128 capturer_.SignalVideoFrame(&capturer_, &test_frame); | 128 capturer_.SignalVideoFrame(&capturer_, &test_frame); |
129 EXPECT_EQ(1, captured_frame_num()); | 129 EXPECT_EQ(1, captured_frame_num()); |
130 capturer_.SignalVideoFrame(&capturer_, &test_frame); | 130 capturer_.SignalVideoFrame(&capturer_, &test_frame); |
131 EXPECT_EQ(2, captured_frame_num()); | 131 EXPECT_EQ(2, captured_frame_num()); |
132 } | 132 } |
OLD | NEW |