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

Side by Side Diff: webrtc/media/devices/win32devicemanager.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/win32devicemanager.h ('k') | webrtc/media/devices/yuvframescapturer.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,
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/win32devicemanager.h" 28 #include "webrtc/media/devices/win32devicemanager.h"
29 29
30 #include <atlbase.h> 30 #include <atlbase.h>
31 #include <dbt.h> 31 #include <dbt.h>
32 #include <strmif.h> // must come before ks.h 32 #include <strmif.h> // must come before ks.h
33 #include <ks.h> 33 #include <ks.h>
34 #include <ksmedia.h> 34 #include <ksmedia.h>
35 #include <mmdeviceapi.h> 35 #include <mmdeviceapi.h>
36 #include <mmsystem.h> 36 #include <mmsystem.h>
37 #include <functiondiscoverykeys_devpkey.h> 37 #include <functiondiscoverykeys_devpkey.h>
38 #include <uuids.h> 38 #include <uuids.h>
39 39
40 // PKEY_AudioEndpoint_GUID isn't included in uuid.lib and we don't want 40 // PKEY_AudioEndpoint_GUID isn't included in uuid.lib and we don't want
41 // to define INITGUID in order to define all the uuids in this object file 41 // to define INITGUID in order to define all the uuids in this object file
42 // as it will conflict with uuid.lib (multiply defined symbols). 42 // as it will conflict with uuid.lib (multiply defined symbols).
43 // So our workaround is to define this one missing symbol here manually. 43 // So our workaround is to define this one missing symbol here manually.
44 // See: https://code.google.com/p/webrtc/issues/detail?id=3996 44 // See: https://code.google.com/p/webrtc/issues/detail?id=3996
45 EXTERN_C const PROPERTYKEY PKEY_AudioEndpoint_GUID = { { 45 EXTERN_C const PROPERTYKEY PKEY_AudioEndpoint_GUID = { {
46 0x1da5d803, 0xd492, 0x4edd, { 46 0x1da5d803, 0xd492, 0x4edd, {
47 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e 47 0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x0e
48 } }, 4 48 } }, 4
49 }; 49 };
50 50
51 #include "webrtc/base/arraysize.h" 51 #include "webrtc/base/arraysize.h"
52 #include "webrtc/base/logging.h" 52 #include "webrtc/base/logging.h"
53 #include "webrtc/base/stringutils.h" 53 #include "webrtc/base/stringutils.h"
54 #include "webrtc/base/thread.h" 54 #include "webrtc/base/thread.h"
55 #include "webrtc/base/win32.h" // ToUtf8 55 #include "webrtc/base/win32.h" // ToUtf8
56 #include "webrtc/base/win32window.h" 56 #include "webrtc/base/win32window.h"
57 #include "talk/media/base/mediacommon.h" 57 #include "webrtc/media/base/mediacommon.h"
58 #ifdef HAVE_LOGITECH_HEADERS 58 #ifdef HAVE_LOGITECH_HEADERS
59 #include "third_party/logitech/files/logitechquickcam.h" 59 #include "third_party/logitech/files/logitechquickcam.h"
60 #endif 60 #endif
61 61
62 namespace cricket { 62 namespace cricket {
63 63
64 DeviceManagerInterface* DeviceManagerFactory::Create() { 64 DeviceManagerInterface* DeviceManagerFactory::Create() {
65 return new Win32DeviceManager(); 65 return new Win32DeviceManager();
66 } 66 }
67 67
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 } 406 }
407 } 407 }
408 result = 0; 408 result = 0;
409 return true; 409 return true;
410 } 410 }
411 411
412 return false; 412 return false;
413 } 413 }
414 414
415 }; // namespace cricket 415 }; // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/devices/win32devicemanager.h ('k') | webrtc/media/devices/yuvframescapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698