06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From: Alex Chronopoulos <achronop@gmail.com>
|
|
Date: Wed, 18 Sep 2019 13:12:00 +0000
|
|
Subject: Bug 1572281 - Remove audio device change notifications from video
|
|
capture in Windows. r=dminor
|
|
|
|
Video capture used to provide device change notifications for audio and video devices. From now on, CubebDeviceEnumerator will provide audio device change notifications thus video capture is updated to notify only changes of the video device. This is the windows part.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D46274
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/a5c23245837ebdd99532e8bfaca05774c5c96d9d
|
|
---
|
|
modules/video_capture/windows/device_info_ds.cc | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc
|
|
index a7eca19bbf..9d22f42f4d 100644
|
|
--- a/modules/video_capture/windows/device_info_ds.cc
|
|
+++ b/modules/video_capture/windows/device_info_ds.cc
|
|
@@ -20,7 +20,7 @@
|
|
namespace webrtc {
|
|
namespace videocapturemodule {
|
|
|
|
-BOOL isCaptureDevice(DEV_BROADCAST_HDR *pHdr)
|
|
+BOOL isVideoDevice(DEV_BROADCAST_HDR *pHdr)
|
|
{
|
|
if (pHdr == NULL) {
|
|
return FALSE;
|
|
@@ -29,7 +29,7 @@ BOOL isCaptureDevice(DEV_BROADCAST_HDR *pHdr)
|
|
return FALSE;
|
|
}
|
|
DEV_BROADCAST_DEVICEINTERFACE* pDi = (DEV_BROADCAST_DEVICEINTERFACE*)pHdr;
|
|
- return pDi->dbcc_classguid == KSCATEGORY_CAPTURE;
|
|
+ return pDi->dbcc_classguid == KSCATEGORY_VIDEO_CAMERA;
|
|
}
|
|
|
|
LRESULT CALLBACK WndProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam)
|
|
@@ -47,7 +47,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam)
|
|
else if (uiMsg == WM_DEVICECHANGE)
|
|
{
|
|
pParent = (DeviceInfoDS*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
|
|
- if (pParent && isCaptureDevice((PDEV_BROADCAST_HDR)lParam))
|
|
+ if (pParent && isVideoDevice((PDEV_BROADCAST_HDR)lParam))
|
|
{
|
|
pParent->DeviceChange();
|
|
}
|
|
@@ -128,7 +128,7 @@ DeviceInfoDS::DeviceInfoDS()
|
|
DEV_BROADCAST_DEVICEINTERFACE di = { 0 };
|
|
di.dbcc_size = sizeof(di);
|
|
di.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
|
|
- di.dbcc_classguid = KSCATEGORY_CAPTURE;
|
|
+ di.dbcc_classguid = KSCATEGORY_VIDEO_CAMERA;
|
|
|
|
_hdevnotify = RegisterDeviceNotification(_hwnd, &di,
|
|
DEVICE_NOTIFY_WINDOW_HANDLE);
|