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
94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Tue, 17 Sep 2019 06:47:00 +0000
|
|
Subject: Bug 1581193 - Fix devicechange event on Windows; r=achronop
|
|
|
|
This restores the code for generating devicechange events that was
|
|
accidentally removed as part of updating the Windows video capture code
|
|
in Bug 1552755.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D46033
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/840c4edafa021eeac6a7e6ae0e828d0adcfea92e
|
|
---
|
|
.../video_capture/windows/device_info_ds.cc | 39 +++++++++++++++++++
|
|
.../video_capture/windows/device_info_ds.h | 3 ++
|
|
2 files changed, 42 insertions(+)
|
|
|
|
diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc
|
|
index d0d274cb02..460ef3b7b9 100644
|
|
--- a/modules/video_capture/windows/device_info_ds.cc
|
|
+++ b/modules/video_capture/windows/device_info_ds.cc
|
|
@@ -20,6 +20,29 @@
|
|
namespace webrtc {
|
|
namespace videocapturemodule {
|
|
|
|
+LRESULT CALLBACK WndProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam)
|
|
+{
|
|
+ DeviceInfoDS* pParent;
|
|
+ if (uiMsg == WM_CREATE)
|
|
+ {
|
|
+ pParent = (DeviceInfoDS*)((LPCREATESTRUCT)lParam)->lpCreateParams;
|
|
+ SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)pParent);
|
|
+ }
|
|
+ else if (uiMsg == WM_DESTROY)
|
|
+ {
|
|
+ SetWindowLongPtr(hWnd, GWLP_USERDATA, NULL);
|
|
+ }
|
|
+ else if (uiMsg == WM_DEVICECHANGE)
|
|
+ {
|
|
+ pParent = (DeviceInfoDS*)GetWindowLongPtr(hWnd, GWLP_USERDATA);
|
|
+ if (pParent)
|
|
+ {
|
|
+ pParent->DeviceChange();
|
|
+ }
|
|
+ }
|
|
+ return DefWindowProc(hWnd, uiMsg, wParam, lParam);
|
|
+}
|
|
+
|
|
// static
|
|
DeviceInfoDS* DeviceInfoDS::Create() {
|
|
DeviceInfoDS* dsInfo = new DeviceInfoDS();
|
|
@@ -77,6 +100,18 @@ DeviceInfoDS::DeviceInfoDS()
|
|
<< rtc::ToHex(hr);
|
|
}
|
|
}
|
|
+
|
|
+ _hInstance = reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL));
|
|
+ _wndClass = {0};
|
|
+ _wndClass.lpfnWndProc = &WndProc;
|
|
+ _wndClass.lpszClassName = TEXT("DeviceInfoDS");
|
|
+ _wndClass.hInstance = _hInstance;
|
|
+
|
|
+ if (RegisterClass(&_wndClass)) {
|
|
+ _hwnd = CreateWindow(_wndClass.lpszClassName, NULL, 0, CW_USEDEFAULT,
|
|
+ CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL,
|
|
+ NULL, _hInstance, this);
|
|
+ }
|
|
}
|
|
|
|
DeviceInfoDS::~DeviceInfoDS() {
|
|
@@ -85,6 +120,10 @@ DeviceInfoDS::~DeviceInfoDS() {
|
|
if (_CoUninitializeIsRequired) {
|
|
CoUninitialize();
|
|
}
|
|
+ if (_hwnd != NULL) {
|
|
+ DestroyWindow(_hwnd);
|
|
+ }
|
|
+ UnregisterClass(_wndClass.lpszClassName, _hInstance);
|
|
}
|
|
|
|
int32_t DeviceInfoDS::Init() {
|
|
diff --git a/modules/video_capture/windows/device_info_ds.h b/modules/video_capture/windows/device_info_ds.h
|
|
index 1b52645cde..dc7b9b1a24 100644
|
|
--- a/modules/video_capture/windows/device_info_ds.h
|
|
+++ b/modules/video_capture/windows/device_info_ds.h
|
|
@@ -93,6 +93,9 @@ class DeviceInfoDS : public DeviceInfoImpl {
|
|
IEnumMoniker* _dsMonikerDevEnum;
|
|
bool _CoUninitializeIsRequired;
|
|
std::vector<VideoCaptureCapabilityWindows> _captureCapabilitiesWindows;
|
|
+ HWND _hwnd;
|
|
+ WNDCLASS _wndClass;
|
|
+ HINSTANCE _hInstance;
|
|
};
|
|
} // namespace videocapturemodule
|
|
} // namespace webrtc
|