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
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Wed, 18 Oct 2023 17:25:00 +0000
|
|
Subject: Bug 1857862 - (fix-32a8169a65) Don't call non-constexpr
|
|
RTC_CHECK_NOTREACHED from constexpr VideoFrameTypeToString under gcc-8.
|
|
r=webrtc-reviewers,mjf
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D191308
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8a4449ba24fa3192b44863ed8ba96f6f94a6e88d
|
|
---
|
|
api/video/video_frame_type.h | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/api/video/video_frame_type.h b/api/video/video_frame_type.h
|
|
index 9079829ff8..3665a80cd8 100644
|
|
--- a/api/video/video_frame_type.h
|
|
+++ b/api/video/video_frame_type.h
|
|
@@ -34,7 +34,11 @@ inline constexpr absl::string_view VideoFrameTypeToString(
|
|
case VideoFrameType::kVideoFrameDelta:
|
|
return "delta";
|
|
}
|
|
+// Mozilla:
|
|
+// gcc-8 complains about a constexpr function calling a non-constexpr ditto.
|
|
+#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 9)
|
|
RTC_CHECK_NOTREACHED();
|
|
+#endif
|
|
return "";
|
|
}
|
|
|