OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 18 matching lines...) Expand all Loading... |
29 #include <vector> | 29 #include <vector> |
30 | 30 |
31 #include "talk/app/webrtc/remotevideocapturer.h" | 31 #include "talk/app/webrtc/remotevideocapturer.h" |
32 #include "talk/app/webrtc/test/fakeconstraints.h" | 32 #include "talk/app/webrtc/test/fakeconstraints.h" |
33 #include "talk/app/webrtc/videosource.h" | 33 #include "talk/app/webrtc/videosource.h" |
34 #include "talk/media/base/fakemediaengine.h" | 34 #include "talk/media/base/fakemediaengine.h" |
35 #include "talk/media/base/fakevideocapturer.h" | 35 #include "talk/media/base/fakevideocapturer.h" |
36 #include "talk/media/base/fakevideorenderer.h" | 36 #include "talk/media/base/fakevideorenderer.h" |
37 #include "talk/media/webrtc/webrtcvideoframe.h" | 37 #include "talk/media/webrtc/webrtcvideoframe.h" |
38 #include "talk/session/media/channelmanager.h" | 38 #include "talk/session/media/channelmanager.h" |
| 39 #include "webrtc/audio/audio_sink.h" |
39 #include "webrtc/base/gunit.h" | 40 #include "webrtc/base/gunit.h" |
40 | 41 |
41 using webrtc::FakeConstraints; | 42 using webrtc::FakeConstraints; |
42 using webrtc::VideoSource; | 43 using webrtc::VideoSource; |
43 using webrtc::MediaConstraintsInterface; | 44 using webrtc::MediaConstraintsInterface; |
44 using webrtc::MediaSourceInterface; | 45 using webrtc::MediaSourceInterface; |
45 using webrtc::ObserverInterface; | 46 using webrtc::ObserverInterface; |
46 using webrtc::VideoSourceInterface; | 47 using webrtc::VideoSourceInterface; |
47 | 48 |
48 namespace { | 49 namespace { |
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5); | 546 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5); |
546 | 547 |
547 CreateVideoSource(&constraints); | 548 CreateVideoSource(&constraints); |
548 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(), | 549 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(), |
549 kMaxWaitMs); | 550 kMaxWaitMs); |
550 const cricket::VideoFormat* format = capturer_->GetCaptureFormat(); | 551 const cricket::VideoFormat* format = capturer_->GetCaptureFormat(); |
551 ASSERT_TRUE(format != NULL); | 552 ASSERT_TRUE(format != NULL); |
552 EXPECT_EQ(30, format->framerate()); | 553 EXPECT_EQ(30, format->framerate()); |
553 } | 554 } |
554 | 555 |
OLD | NEW |