third_party/libwebrtc/moz-patch-stack/0036.patch

   1 From: Nico Grunbaum <na-g@nostrum.com>
   2 Date: Thu, 18 Feb 2021 17:23:00 -0800
   3 Subject: Bug 1654112 - fix device_info_ds pid and Windows constants includes;
   4  r=pehrsons
   5
   6 Upstreaming bug 1697385
   7
   8 Differential Revision: https://phabricator.services.mozilla.com/D107899
   9 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/24809d566449907edea49ea47528065ad0f76910
  10 ---
  11  modules/video_capture/windows/device_info_ds.cc | 3 ++-
  12  modules/video_capture/windows/device_info_ds.h  | 6 +++++-
  13  2 files changed, 7 insertions(+), 2 deletions(-)
  14
  15 diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc
  16 index 9d22f42f4d..f6927281f3 100644
  17 --- a/modules/video_capture/windows/device_info_ds.cc
  18 +++ b/modules/video_capture/windows/device_info_ds.cc
  19 @@ -172,7 +172,8 @@ int32_t DeviceInfoDS::GetDeviceName(uint32_t deviceNumber,
  20                                      char* deviceUniqueIdUTF8,
  21                                      uint32_t deviceUniqueIdUTF8Length,
  22                                      char* productUniqueIdUTF8,
  23 -                                    uint32_t productUniqueIdUTF8Length) {
  24 +                                    uint32_t productUniqueIdUTF8Length,
  25 +                                    pid_t* pid) {
  26    MutexLock lock(&_apiLock);
  27    const int32_t result = GetDeviceInfo(
  28        deviceNumber, deviceNameUTF8, deviceNameLength, deviceUniqueIdUTF8,
  29 diff --git a/modules/video_capture/windows/device_info_ds.h b/modules/video_capture/windows/device_info_ds.h
  30 index ed2a726d6f..e6dfaed366 100644
  31 --- a/modules/video_capture/windows/device_info_ds.h
  32 +++ b/modules/video_capture/windows/device_info_ds.h
  33 @@ -12,8 +12,11 @@
  34  #define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_
  35
  36  #include <dshow.h>
  37 +#include <Ks.h>
  38 +#include <dbt.h>
  39
  40  #include "modules/video_capture/device_info_impl.h"
  41 +#include "modules/video_capture/video_capture.h"
  42  #include "modules/video_capture/video_capture_impl.h"
  43
  44  namespace webrtc {
  45 @@ -47,7 +50,8 @@ class DeviceInfoDS : public DeviceInfoImpl {
  46                          char* deviceUniqueIdUTF8,
  47                          uint32_t deviceUniqueIdUTF8Length,
  48                          char* productUniqueIdUTF8,
  49 -                        uint32_t productUniqueIdUTF8Length) override;
  50 +                        uint32_t productUniqueIdUTF8Length,
  51 +                        pid_t* pid) override;
  52
  53    /*
  54     * Display OS /capture device specific settings dialog