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

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

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 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/remotevideocapturer_unittest.cc ('k') | webrtc/api/videotrack_unittest.cc » ('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 * 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 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "talk/session/media/channelmanager.h" 14 #include "talk/session/media/channelmanager.h"
15 #include "webrtc/api/remotevideocapturer.h" 15 #include "webrtc/api/remotevideocapturer.h"
16 #include "webrtc/api/test/fakeconstraints.h" 16 #include "webrtc/api/test/fakeconstraints.h"
17 #include "webrtc/api/videosource.h" 17 #include "webrtc/api/videosource.h"
18 #include "webrtc/base/gunit.h" 18 #include "webrtc/base/gunit.h"
19 #include "webrtc/media/base/fakemediaengine.h" 19 #include "webrtc/media/base/fakemediaengine.h"
20 #include "webrtc/media/base/fakevideocapturer.h" 20 #include "webrtc/media/base/fakevideocapturer.h"
21 #include "webrtc/media/base/fakevideorenderer.h" 21 #include "webrtc/media/base/fakevideorenderer.h"
22 #include "webrtc/media/webrtc/webrtcvideoframe.h" 22 #include "webrtc/media/engine/webrtcvideoframe.h"
23 23
24 using webrtc::FakeConstraints; 24 using webrtc::FakeConstraints;
25 using webrtc::VideoSource; 25 using webrtc::VideoSource;
26 using webrtc::MediaConstraintsInterface; 26 using webrtc::MediaConstraintsInterface;
27 using webrtc::MediaSourceInterface; 27 using webrtc::MediaSourceInterface;
28 using webrtc::ObserverInterface; 28 using webrtc::ObserverInterface;
29 using webrtc::VideoSourceInterface; 29 using webrtc::VideoSourceInterface;
30 30
31 namespace { 31 namespace {
32 32
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 FakeConstraints constraints; 520 FakeConstraints constraints;
521 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5); 521 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
522 522
523 CreateVideoSource(&constraints); 523 CreateVideoSource(&constraints);
524 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(), 524 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
525 kMaxWaitMs); 525 kMaxWaitMs);
526 const cricket::VideoFormat* format = capturer_->GetCaptureFormat(); 526 const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
527 ASSERT_TRUE(format != NULL); 527 ASSERT_TRUE(format != NULL);
528 EXPECT_EQ(30, format->framerate()); 528 EXPECT_EQ(30, format->framerate());
529 } 529 }
OLDNEW
« no previous file with comments | « webrtc/api/remotevideocapturer_unittest.cc ('k') | webrtc/api/videotrack_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698