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
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Michael Froman <mjfroman@mac.com>
|
|
Date: Fri, 8 Apr 2022 11:36:36 -0500
|
|
Subject: Bug 1766646 - (fix-b556b08668) avoid InlinedVector method that can
|
|
throw exception
|
|
|
|
---
|
|
api/video_codecs/video_encoder.cc | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
|
|
index 40726431bd..4e3369000c 100644
|
|
--- a/api/video_codecs/video_encoder.cc
|
|
+++ b/api/video_codecs/video_encoder.cc
|
|
@@ -190,7 +190,15 @@ std::string VideoEncoder::EncoderInfo::ToString() const {
|
|
for (size_t i = 0; i < preferred_pixel_formats.size(); ++i) {
|
|
if (i > 0)
|
|
oss << ", ";
|
|
+#if defined(WEBRTC_MOZILLA_BUILD)
|
|
+ // This could assert, as opposed to throw using the form in the
|
|
+ // else, but since we're in a for loop that uses .size() we can
|
|
+ // be fairly sure that this is safe without doing a further
|
|
+ // check to make sure 'i' is in-range.
|
|
+ oss << VideoFrameBufferTypeToString(preferred_pixel_formats[i]);
|
|
+#else
|
|
oss << VideoFrameBufferTypeToString(preferred_pixel_formats.at(i));
|
|
+#endif
|
|
}
|
|
oss << "]";
|
|
if (is_qp_trusted.has_value()) {
|