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
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Mon, 14 Oct 2024 18:40:00 -0500
|
|
Subject: Bug 1924098 - (fix-93c9aa1914) add missing include that upstream
|
|
missed
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/90a6b254783eaa91d0305d8516f27f1ca68c6772
|
|
---
|
|
call/video_receive_stream.h | 1 +
|
|
call/video_send_stream.h | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h
|
|
index 574d8cea6d..50c27e7242 100644
|
|
--- a/call/video_receive_stream.h
|
|
+++ b/call/video_receive_stream.h
|
|
@@ -25,6 +25,7 @@
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "api/crypto/crypto_options.h"
|
|
#include "api/crypto/frame_decryptor_interface.h"
|
|
+#include "api/crypto/frame_encryptor_interface.h"
|
|
#include "api/frame_transformer_interface.h"
|
|
#include "api/rtp_headers.h"
|
|
#include "api/scoped_refptr.h"
|
|
diff --git a/call/video_send_stream.h b/call/video_send_stream.h
|
|
index e94be2df91..cc9c98d09c 100644
|
|
--- a/call/video_send_stream.h
|
|
+++ b/call/video_send_stream.h
|
|
@@ -21,6 +21,7 @@
|
|
#include "api/adaptation/resource.h"
|
|
#include "api/call/transport.h"
|
|
#include "api/crypto/crypto_options.h"
|
|
+#include "api/crypto/frame_encryptor_interface.h"
|
|
#include "api/frame_transformer_interface.h"
|
|
#include "api/rtp_parameters.h"
|
|
#include "api/rtp_sender_setparameters_callback.h"
|