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

Side by Side Diff: webrtc/media/devices/filevideocapturer_unittest.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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/media/devices/filevideocapturer.cc ('k') | webrtc/media/devices/gdivideorenderer.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 2004 Google Inc. 3 * Copyright 2004 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 12 matching lines...) Expand all
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 <stdio.h> 28 #include <stdio.h>
29 29
30 #include <string> 30 #include <string>
31 #include <vector> 31 #include <vector>
32 32
33 #include "talk/media/base/testutils.h"
34 #include "talk/media/devices/filevideocapturer.h"
35 #include "webrtc/base/gunit.h" 33 #include "webrtc/base/gunit.h"
36 #include "webrtc/base/logging.h" 34 #include "webrtc/base/logging.h"
37 #include "webrtc/base/thread.h" 35 #include "webrtc/base/thread.h"
36 #include "webrtc/media/base/testutils.h"
37 #include "webrtc/media/devices/filevideocapturer.h"
38 38
39 namespace { 39 namespace {
40 40
41 class FileVideoCapturerTest : public testing::Test { 41 class FileVideoCapturerTest : public testing::Test {
42 public: 42 public:
43 virtual void SetUp() { 43 virtual void SetUp() {
44 capturer_.reset(new cricket::FileVideoCapturer); 44 capturer_.reset(new cricket::FileVideoCapturer);
45 } 45 }
46 46
47 bool OpenFile(const std::string& filename) { 47 bool OpenFile(const std::string& filename) {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 cricket::GetTestFilePath("captured-320x240-2s-48.frames"); 195 cricket::GetTestFilePath("captured-320x240-2s-48.frames");
196 cricket::Device file_device = 196 cricket::Device file_device =
197 cricket::FileVideoCapturer::CreateFileVideoCapturerDevice(test_file); 197 cricket::FileVideoCapturer::CreateFileVideoCapturerDevice(test_file);
198 EXPECT_TRUE( 198 EXPECT_TRUE(
199 cricket::FileVideoCapturer::IsFileVideoCapturerDevice(file_device)); 199 cricket::FileVideoCapturer::IsFileVideoCapturerDevice(file_device));
200 EXPECT_TRUE(capturer_->Init(file_device)); 200 EXPECT_TRUE(capturer_->Init(file_device));
201 EXPECT_EQ(file_device.id, capturer_->GetId()); 201 EXPECT_EQ(file_device.id, capturer_->GetId());
202 } 202 }
203 203
204 } // unnamed namespace 204 } // unnamed namespace
OLDNEW
« no previous file with comments | « webrtc/media/devices/filevideocapturer.cc ('k') | webrtc/media/devices/gdivideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698