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

Side by Side Diff: webrtc/api/videosource_unittest.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds 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
« no previous file with comments | « webrtc/api/videosource.cc ('k') | webrtc/api/videosourceinterface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 10 matching lines...) Expand all
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 #include <vector> 29 #include <vector>
30 30
31 #include "talk/app/webrtc/remotevideocapturer.h"
32 #include "talk/app/webrtc/test/fakeconstraints.h"
33 #include "talk/app/webrtc/videosource.h"
34 #include "talk/session/media/channelmanager.h" 31 #include "talk/session/media/channelmanager.h"
32 #include "webrtc/api/remotevideocapturer.h"
33 #include "webrtc/api/test/fakeconstraints.h"
34 #include "webrtc/api/videosource.h"
35 #include "webrtc/base/gunit.h" 35 #include "webrtc/base/gunit.h"
36 #include "webrtc/media/base/fakemediaengine.h" 36 #include "webrtc/media/base/fakemediaengine.h"
37 #include "webrtc/media/base/fakevideocapturer.h" 37 #include "webrtc/media/base/fakevideocapturer.h"
38 #include "webrtc/media/base/fakevideorenderer.h" 38 #include "webrtc/media/base/fakevideorenderer.h"
39 #include "webrtc/media/webrtc/webrtcvideoframe.h" 39 #include "webrtc/media/webrtc/webrtcvideoframe.h"
40 40
41 using webrtc::FakeConstraints; 41 using webrtc::FakeConstraints;
42 using webrtc::VideoSource; 42 using webrtc::VideoSource;
43 using webrtc::MediaConstraintsInterface; 43 using webrtc::MediaConstraintsInterface;
44 using webrtc::MediaSourceInterface; 44 using webrtc::MediaSourceInterface;
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 FakeConstraints constraints; 537 FakeConstraints constraints;
538 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5); 538 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
539 539
540 CreateVideoSource(&constraints); 540 CreateVideoSource(&constraints);
541 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(), 541 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
542 kMaxWaitMs); 542 kMaxWaitMs);
543 const cricket::VideoFormat* format = capturer_->GetCaptureFormat(); 543 const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
544 ASSERT_TRUE(format != NULL); 544 ASSERT_TRUE(format != NULL);
545 EXPECT_EQ(30, format->framerate()); 545 EXPECT_EQ(30, format->framerate());
546 } 546 }
OLDNEW
« no previous file with comments | « webrtc/api/videosource.cc ('k') | webrtc/api/videosourceinterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698