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
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Sat, 13 Feb 2021 04:20:00 -0800
|
|
Subject: Bug 1654112 - Add pid_t to desktop_capture_types.h; r=pehrsons
|
|
|
|
Upstreaming bug 1697385
|
|
|
|
Also includes:
|
|
Bug 1654112 - Clarifying prev. rev that moved pid_t into the global namespace; r=dminor
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D107897
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/539b69f0e21118a1898f1ef689577c7193ff7be7
|
|
---
|
|
modules/desktop_capture/desktop_capture_types.h | 4 ++++
|
|
modules/video_capture/video_capture.h | 1 +
|
|
2 files changed, 5 insertions(+)
|
|
|
|
diff --git a/modules/desktop_capture/desktop_capture_types.h b/modules/desktop_capture/desktop_capture_types.h
|
|
index a4e3e897fd..e777a45f92 100644
|
|
--- a/modules/desktop_capture/desktop_capture_types.h
|
|
+++ b/modules/desktop_capture/desktop_capture_types.h
|
|
@@ -13,6 +13,10 @@
|
|
|
|
#include <stdint.h>
|
|
|
|
+#ifdef XP_WIN // Moving this into the global namespace
|
|
+typedef int pid_t; // matching what used to be in
|
|
+#endif // video_capture_defines.h
|
|
+
|
|
namespace webrtc {
|
|
|
|
enum class CaptureType { kWindow, kScreen, kAnyScreenContent };
|
|
diff --git a/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h
|
|
index f31b239c71..7279bed476 100644
|
|
--- a/modules/video_capture/video_capture.h
|
|
+++ b/modules/video_capture/video_capture.h
|
|
@@ -13,6 +13,7 @@
|
|
|
|
#include "api/video/video_rotation.h"
|
|
#include "api/video/video_sink_interface.h"
|
|
+#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/video_capture/raw_video_sink_interface.h"
|
|
#include "modules/video_capture/video_capture_defines.h"
|
|
#include <set>
|