File: s0046.patch

package info (click to toggle)
firefox 147.0.2-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 4,683,484 kB
  • sloc: cpp: 7,607,246; javascript: 6,533,185; ansic: 3,775,227; python: 1,415,393; xml: 634,561; asm: 438,951; java: 186,241; sh: 62,752; makefile: 18,079; objc: 13,092; perl: 12,808; yacc: 4,583; cs: 3,846; pascal: 3,448; lex: 1,720; ruby: 1,003; php: 436; lisp: 258; awk: 247; sql: 66; sed: 54; csh: 10; exp: 6
file content (29 lines) | stat: -rw-r--r-- 1,132 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
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 31807707d9..cff9cf7f78 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -183,7 +183,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()) {