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

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

Issue 2471783002: Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Created 4 years, 1 month 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/mediastreamtrackproxy.h ('k') | webrtc/api/videosourceproxy.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 * 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 <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "webrtc/api/test/fakeconstraints.h" 15 #include "webrtc/api/test/fakeconstraints.h"
16 #include "webrtc/api/videocapturertracksource.h" 16 #include "webrtc/api/videocapturertracksource.h"
17 #include "webrtc/base/gunit.h" 17 #include "webrtc/base/gunit.h"
18 #include "webrtc/media/base/fakemediaengine.h" 18 #include "webrtc/media/base/fakemediaengine.h"
19 #include "webrtc/media/base/fakevideocapturer.h" 19 #include "webrtc/media/base/fakevideocapturer.h"
20 #include "webrtc/media/base/fakevideorenderer.h" 20 #include "webrtc/media/base/fakevideorenderer.h"
21 #include "webrtc/media/engine/webrtcvideoframe.h"
21 22
22 using webrtc::FakeConstraints; 23 using webrtc::FakeConstraints;
23 using webrtc::VideoCapturerTrackSource; 24 using webrtc::VideoCapturerTrackSource;
24 using webrtc::MediaConstraintsInterface; 25 using webrtc::MediaConstraintsInterface;
25 using webrtc::MediaSourceInterface; 26 using webrtc::MediaSourceInterface;
26 using webrtc::ObserverInterface; 27 using webrtc::ObserverInterface;
27 using webrtc::VideoTrackSourceInterface; 28 using webrtc::VideoTrackSourceInterface;
28 29
29 namespace { 30 namespace {
30 31
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 FakeConstraints constraints; 458 FakeConstraints constraints;
458 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5); 459 constraints.AddOptional(MediaConstraintsInterface::kMaxFrameRate, 0.5);
459 460
460 CreateVideoCapturerSource(&constraints); 461 CreateVideoCapturerSource(&constraints);
461 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(), 462 EXPECT_EQ_WAIT(MediaSourceInterface::kLive, state_observer_->state(),
462 kMaxWaitMs); 463 kMaxWaitMs);
463 const cricket::VideoFormat* format = capturer_->GetCaptureFormat(); 464 const cricket::VideoFormat* format = capturer_->GetCaptureFormat();
464 ASSERT_TRUE(format != NULL); 465 ASSERT_TRUE(format != NULL);
465 EXPECT_EQ(1, format->framerate()); 466 EXPECT_EQ(1, format->framerate());
466 } 467 }
OLDNEW
« no previous file with comments | « webrtc/api/mediastreamtrackproxy.h ('k') | webrtc/api/videosourceproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698