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

Side by Side Diff: webrtc/media/devices/devicemanager.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/devicemanager.h ('k') | webrtc/media/devices/devicemanager_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 * 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,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
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 "talk/media/devices/devicemanager.h" 28 #include "webrtc/media/devices/devicemanager.h"
29 29
30 #include "talk/media/base/mediacommon.h"
31 #include "talk/media/base/videocapturerfactory.h"
32 #include "talk/media/devices/deviceinfo.h"
33 #include "talk/media/devices/filevideocapturer.h"
34 #include "talk/media/devices/yuvframescapturer.h"
35 #include "webrtc/base/fileutils.h" 30 #include "webrtc/base/fileutils.h"
36 #include "webrtc/base/logging.h" 31 #include "webrtc/base/logging.h"
37 #include "webrtc/base/pathutils.h" 32 #include "webrtc/base/pathutils.h"
38 #include "webrtc/base/stringutils.h" 33 #include "webrtc/base/stringutils.h"
39 #include "webrtc/base/thread.h" 34 #include "webrtc/base/thread.h"
40 #include "webrtc/base/windowpicker.h" 35 #include "webrtc/base/windowpicker.h"
41 #include "webrtc/base/windowpickerfactory.h" 36 #include "webrtc/base/windowpickerfactory.h"
37 #include "webrtc/media/base/mediacommon.h"
38 #include "webrtc/media/base/videocapturerfactory.h"
39 #include "webrtc/media/devices/deviceinfo.h"
40 #include "webrtc/media/devices/filevideocapturer.h"
41 #include "webrtc/media/devices/yuvframescapturer.h"
42 42
43 #ifdef HAVE_WEBRTC_VIDEO 43 #ifdef HAVE_WEBRTC_VIDEO
44 #include "talk/media/webrtc/webrtcvideocapturerfactory.h" 44 #include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
45 #endif // HAVE_WEBRTC_VIDEO 45 #endif // HAVE_WEBRTC_VIDEO
46 46
47 namespace { 47 namespace {
48 48
49 bool StringMatchWithWildcard( 49 bool StringMatchWithWildcard(
50 const std::pair<const std::basic_string<char>, cricket::VideoFormat> key, 50 const std::pair<const std::basic_string<char>, cricket::VideoFormat> key,
51 const std::string& val) { 51 const std::string& val) {
52 return rtc::string_match(val.c_str(), key.first.c_str()); 52 return rtc::string_match(val.c_str(), key.first.c_str());
53 } 53 }
54 54
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 if (ShouldDeviceBeIgnored(it->name, exclusion_list)) { 362 if (ShouldDeviceBeIgnored(it->name, exclusion_list)) {
363 it = devices->erase(it); 363 it = devices->erase(it);
364 } else { 364 } else {
365 ++it; 365 ++it;
366 } 366 }
367 } 367 }
368 return true; 368 return true;
369 } 369 }
370 370
371 } // namespace cricket 371 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/devices/devicemanager.h ('k') | webrtc/media/devices/devicemanager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698