|
1164
|
1 |
# HG changeset patch
|
|
1190
|
2 |
# Parent 5df550d4b5fc674268055e504f60392389eb9ea7
|
|
1164
|
3 |
|
|
1190
|
4 |
Index: firefox-115.0/gfx/skia/skia/include/codec/SkEncodedOrigin.h
|
|
|
5 |
===================================================================
|
|
|
6 |
--- firefox-115.0.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h
|
|
|
7 |
+++ firefox-115.0/gfx/skia/skia/include/codec/SkEncodedOrigin.h
|
|
|
8 |
@@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginTo
|
|
|
9 |
case kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0, 1, 0, -1, 0, h, 0, 0, 1);
|
|
1162
|
10 |
}
|
|
|
11 |
SK_ABORT("Unexpected origin");
|
|
|
12 |
+ SkUNREACHABLE;
|
|
|
13 |
}
|
|
|
14 |
|
|
1190
|
15 |
/**
|
|
|
16 |
Index: firefox-115.0/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h
|
|
|
17 |
===================================================================
|
|
|
18 |
--- firefox-115.0.orig/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h
|
|
|
19 |
+++ firefox-115.0/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h
|
|
|
20 |
@@ -325,6 +325,7 @@ static inline bool GrTextureTypeHasRestr
|
|
1162
|
21 |
default:
|
|
|
22 |
SK_ABORT("Unexpected texture type");
|
|
|
23 |
}
|
|
|
24 |
+ SkUNREACHABLE;
|
|
|
25 |
}
|
|
|
26 |
|
|
1190
|
27 |
//////////////////////////////////////////////////////////////////////////////
|
|
|
28 |
Index: firefox-115.0/gfx/skia/skia/src/core/SkDescriptor.cpp
|
|
|
29 |
===================================================================
|
|
|
30 |
--- firefox-115.0.orig/gfx/skia/skia/src/core/SkDescriptor.cpp
|
|
|
31 |
+++ firefox-115.0/gfx/skia/skia/src/core/SkDescriptor.cpp
|
|
|
32 |
@@ -26,6 +26,7 @@ std::unique_ptr<SkDescriptor> SkDescript
|
|
|
33 |
void SkDescriptor::operator delete(void* p) { ::operator delete(p); }
|
|
|
34 |
void* SkDescriptor::operator new(size_t) {
|
|
|
35 |
SK_ABORT("Descriptors are created with placement new.");
|
|
1162
|
36 |
+ SkUNREACHABLE;
|
|
|
37 |
}
|
|
|
38 |
|
|
1190
|
39 |
void SkDescriptor::flatten(SkWriteBuffer& buffer) const {
|
|
|
40 |
Index: firefox-115.0/gfx/skia/skia/src/core/SkGeometry.h
|
|
|
41 |
===================================================================
|
|
|
42 |
--- firefox-115.0.orig/gfx/skia/skia/src/core/SkGeometry.h
|
|
|
43 |
+++ firefox-115.0/gfx/skia/skia/src/core/SkGeometry.h
|
|
|
44 |
@@ -281,6 +281,7 @@ static inline bool SkCubicIsDegenerate(S
|
|
1162
|
45 |
return true;
|
|
|
46 |
}
|
|
|
47 |
SK_ABORT("Invalid SkCubicType");
|
|
|
48 |
+ SkUNREACHABLE;
|
|
|
49 |
}
|
|
|
50 |
|
|
|
51 |
static inline const char* SkCubicTypeName(SkCubicType type) {
|
|
1190
|
52 |
@@ -293,6 +294,7 @@ static inline const char* SkCubicTypeNam
|
|
1162
|
53 |
case SkCubicType::kLineOrPoint: return "kLineOrPoint";
|
|
|
54 |
}
|
|
|
55 |
SK_ABORT("Invalid SkCubicType");
|
|
|
56 |
+ SkUNREACHABLE;
|
|
|
57 |
}
|
|
|
58 |
|
|
|
59 |
/** Returns the cubic classification.
|
|
1190
|
60 |
Index: firefox-115.0/gfx/skia/skia/src/core/SkTextBlob.cpp
|
|
|
61 |
===================================================================
|
|
|
62 |
--- firefox-115.0.orig/gfx/skia/skia/src/core/SkTextBlob.cpp
|
|
|
63 |
+++ firefox-115.0/gfx/skia/skia/src/core/SkTextBlob.cpp
|
|
|
64 |
@@ -204,6 +204,7 @@ void SkTextBlob::operator delete(void* p
|
|
1162
|
65 |
|
|
|
66 |
void* SkTextBlob::operator new(size_t) {
|
|
|
67 |
SK_ABORT("All blobs are created by placement new.");
|
|
|
68 |
+ SkUNREACHABLE;
|
|
|
69 |
}
|
|
|
70 |
|
|
|
71 |
void* SkTextBlob::operator new(size_t, void* p) {
|
|
1190
|
72 |
Index: firefox-115.0/gfx/skia/skia/src/core/SkTypeface_remote.h
|
|
|
73 |
===================================================================
|
|
|
74 |
--- firefox-115.0.orig/gfx/skia/skia/src/core/SkTypeface_remote.h
|
|
|
75 |
+++ firefox-115.0/gfx/skia/skia/src/core/SkTypeface_remote.h
|
|
|
76 |
@@ -95,12 +95,14 @@ public:
|
|
1162
|
77 |
bool isLogging() const {return fIsLogging;}
|
|
|
78 |
|
|
|
79 |
protected:
|
|
|
80 |
- int onGetUPEM() const override { SK_ABORT("Should never be called."); }
|
|
|
81 |
+ int onGetUPEM() const override { SK_ABORT("Should never be called."); SkUNREACHABLE; }
|
|
|
82 |
std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override {
|
|
|
83 |
SK_ABORT("Should never be called.");
|
|
1190
|
84 |
+ SkUNREACHABLE;
|
|
1162
|
85 |
}
|
|
|
86 |
sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {
|
|
|
87 |
SK_ABORT("Should never be called.");
|
|
1190
|
88 |
+ SkUNREACHABLE;
|
|
1162
|
89 |
}
|
|
1190
|
90 |
bool onGlyphMaskNeedsCurrentColor() const override {
|
|
|
91 |
return fGlyphMaskNeedsCurrentColor;
|
|
|
92 |
@@ -108,10 +110,12 @@ protected:
|
|
1162
|
93 |
int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],
|
|
|
94 |
int coordinateCount) const override {
|
|
|
95 |
SK_ABORT("Should never be called.");
|
|
1190
|
96 |
+ SkUNREACHABLE;
|
|
1162
|
97 |
}
|
|
|
98 |
int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
|
|
|
99 |
int parameterCount) const override {
|
|
|
100 |
SK_ABORT("Should never be called.");
|
|
1190
|
101 |
+ SkUNREACHABLE;
|
|
1162
|
102 |
}
|
|
|
103 |
void onGetFamilyName(SkString* familyName) const override {
|
|
|
104 |
// Used by SkStrikeCache::DumpMemoryStatistics.
|
|
1190
|
105 |
@@ -119,15 +123,19 @@ protected:
|
|
|
106 |
}
|
|
|
107 |
bool onGetPostScriptName(SkString*) const override {
|
|
|
108 |
SK_ABORT("Should never be called.");
|
|
|
109 |
+ SkUNREACHABLE;
|
|
1162
|
110 |
}
|
|
|
111 |
SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {
|
|
|
112 |
SK_ABORT("Should never be called.");
|
|
1190
|
113 |
+ SkUNREACHABLE;
|
|
1162
|
114 |
}
|
|
|
115 |
int onGetTableTags(SkFontTableTag tags[]) const override {
|
|
|
116 |
SK_ABORT("Should never be called.");
|
|
1190
|
117 |
+ SkUNREACHABLE;
|
|
1162
|
118 |
}
|
|
|
119 |
size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override {
|
|
|
120 |
SK_ABORT("Should never be called.");
|
|
1190
|
121 |
+ SkUNREACHABLE;
|
|
|
122 |
}
|
|
|
123 |
std::unique_ptr<SkScalerContext> onCreateScalerContext(
|
|
|
124 |
const SkScalerContextEffects& effects, const SkDescriptor* desc) const override
|
|
|
125 |
@@ -141,20 +149,25 @@ protected:
|
|
1162
|
126 |
}
|
|
1190
|
127 |
void onGetFontDescriptor(SkFontDescriptor*, bool*) const override {
|
|
|
128 |
SK_ABORT("Should never be called.");
|
|
|
129 |
+ SkUNREACHABLE;
|
|
1177
|
130 |
}
|
|
1190
|
131 |
void getGlyphToUnicodeMap(SkUnichar*) const override {
|
|
|
132 |
SK_ABORT("Should never be called.");
|
|
|
133 |
+ SkUNREACHABLE;
|
|
1177
|
134 |
}
|
|
|
135 |
|
|
|
136 |
void getPostScriptGlyphNames(SkString*) const override {
|
|
|
137 |
SK_ABORT("Should never be called.");
|
|
1190
|
138 |
+ SkUNREACHABLE;
|
|
1177
|
139 |
}
|
|
1162
|
140 |
|
|
|
141 |
std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const override {
|
|
|
142 |
SK_ABORT("Should never be called.");
|
|
1190
|
143 |
+ SkUNREACHABLE;
|
|
1162
|
144 |
}
|
|
|
145 |
void onCharsToGlyphs(const SkUnichar* chars, int count, SkGlyphID glyphs[]) const override {
|
|
|
146 |
SK_ABORT("Should never be called.");
|
|
1190
|
147 |
+ SkUNREACHABLE;
|
|
1177
|
148 |
}
|
|
|
149 |
int onCountGlyphs() const override {
|
|
|
150 |
return this->glyphCount();
|
|
1190
|
151 |
@@ -162,6 +175,7 @@ protected:
|
|
1162
|
152 |
|
|
|
153 |
void* onGetCTFontRef() const override {
|
|
|
154 |
SK_ABORT("Should never be called.");
|
|
1190
|
155 |
+ SkUNREACHABLE;
|
|
1162
|
156 |
}
|
|
|
157 |
|
|
|
158 |
private:
|
|
1190
|
159 |
Index: firefox-115.0/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
|
|
|
160 |
===================================================================
|
|
|
161 |
--- firefox-115.0.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
|
|
|
162 |
+++ firefox-115.0/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
|
|
|
163 |
@@ -815,6 +815,7 @@ sk_sp<SkSpecialImage> cpu_blur(
|
|
|
164 |
return maker;
|
|
|
165 |
}
|
|
|
166 |
SK_ABORT("Sigma is out of range.");
|
|
|
167 |
+ SkUNREACHABLE;
|
|
|
168 |
};
|
|
1177
|
169 |
|
|
1190
|
170 |
PassMaker* makerX = makeMaker(sigma.x());
|
|
|
171 |
Index: firefox-115.0/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
|
|
|
172 |
===================================================================
|
|
|
173 |
--- firefox-115.0.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
|
|
|
174 |
+++ firefox-115.0/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
|
|
|
175 |
@@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName
|
|
1162
|
176 |
|
|
|
177 |
SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {
|
|
|
178 |
SK_ABORT("Not implemented");
|
|
|
179 |
+ SkUNREACHABLE;
|
|
|
180 |
}
|
|
|
181 |
|
|
|
182 |
SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const {
|
|
1190
|
183 |
Index: firefox-115.0/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
|
|
|
184 |
===================================================================
|
|
|
185 |
--- firefox-115.0.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
|
|
|
186 |
+++ firefox-115.0/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
|
|
|
187 |
@@ -162,18 +162,22 @@ public:
|
|
1162
|
188 |
protected:
|
|
|
189 |
int onCountFamilies() const override {
|
|
|
190 |
SK_ABORT("Not implemented.");
|
|
|
191 |
+ SkUNREACHABLE;
|
|
|
192 |
}
|
|
|
193 |
|
|
|
194 |
void onGetFamilyName(int index, SkString* familyName) const override {
|
|
|
195 |
SK_ABORT("Not implemented.");
|
|
|
196 |
+ SkUNREACHABLE;
|
|
|
197 |
}
|
|
|
198 |
|
|
|
199 |
SkFontStyleSet* onCreateStyleSet(int index) const override {
|
|
|
200 |
SK_ABORT("Not implemented.");
|
|
|
201 |
+ SkUNREACHABLE;
|
|
|
202 |
}
|
|
|
203 |
|
|
|
204 |
SkFontStyleSet* onMatchFamily(const char familyName[]) const override {
|
|
|
205 |
SK_ABORT("Not implemented.");
|
|
|
206 |
+ SkUNREACHABLE;
|
|
|
207 |
}
|
|
|
208 |
|
|
|
209 |
SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[],
|
|
1190
|
210 |
Index: firefox-115.0/gfx/skia/skia/src/sksl/SkSLCompiler.cpp
|
|
|
211 |
===================================================================
|
|
|
212 |
--- firefox-115.0.orig/gfx/skia/skia/src/sksl/SkSLCompiler.cpp
|
|
|
213 |
+++ firefox-115.0/gfx/skia/skia/src/sksl/SkSLCompiler.cpp
|
|
|
214 |
@@ -277,6 +277,7 @@ std::unique_ptr<Expression> Compiler::co
|
|
1177
|
215 |
}
|
|
1190
|
216 |
default:
|
|
|
217 |
SK_ABORT("unsupported symbol type %d\n", (int) result->kind());
|
|
|
218 |
+ SkUNREACHABLE;
|
|
1177
|
219 |
}
|
|
1190
|
220 |
}
|
|
1177
|
221 |
|
|
1190
|
222 |
Index: firefox-115.0/gfx/skia/skia/src/sksl/SkSLOperator.cpp
|
|
|
223 |
===================================================================
|
|
|
224 |
--- firefox-115.0.orig/gfx/skia/skia/src/sksl/SkSLOperator.cpp
|
|
|
225 |
+++ firefox-115.0/gfx/skia/skia/src/sksl/SkSLOperator.cpp
|
|
|
226 |
@@ -51,7 +51,7 @@ OperatorPrecedence Operator::getBinaryPr
|
|
|
227 |
case Kind::BITWISEXOREQ: // fall through
|
|
|
228 |
case Kind::BITWISEOREQ: return OperatorPrecedence::kAssignment;
|
|
|
229 |
case Kind::COMMA: return OperatorPrecedence::kSequence;
|
|
|
230 |
- default: SK_ABORT("unsupported binary operator");
|
|
|
231 |
+ default: SkUNREACHABLE;
|
|
1162
|
232 |
}
|
|
1190
|
233 |
}
|
|
1162
|
234 |
|
|
1190
|
235 |
Index: firefox-115.0/gfx/skia/skia/src/sksl/ir/SkSLType.h
|
|
|
236 |
===================================================================
|
|
|
237 |
--- firefox-115.0.orig/gfx/skia/skia/src/sksl/ir/SkSLType.h
|
|
|
238 |
+++ firefox-115.0/gfx/skia/skia/src/sksl/ir/SkSLType.h
|
|
|
239 |
@@ -422,6 +422,7 @@ public:
|
|
1162
|
240 |
|
|
1190
|
241 |
virtual const std::vector<Field>& fields() const {
|
|
|
242 |
SK_ABORT("Internal error: not a struct");
|
|
|
243 |
+ SkUNREACHABLE;
|
|
1177
|
244 |
}
|
|
|
245 |
|
|
1190
|
246 |
/**
|
|
|
247 |
Index: firefox-115.0/gfx/skia/skia/src/utils/SkShadowUtils.cpp
|
|
|
248 |
===================================================================
|
|
|
249 |
--- firefox-115.0.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp
|
|
|
250 |
+++ firefox-115.0/gfx/skia/skia/src/utils/SkShadowUtils.cpp
|
|
|
251 |
@@ -140,6 +140,7 @@ struct SpotVerticesFactory {
|
|
|
252 |
return true;
|
|
1162
|
253 |
}
|
|
|
254 |
SK_ABORT("Uninitialized occluder type?");
|
|
1190
|
255 |
+ SkUNREACHABLE;
|
|
1162
|
256 |
}
|
|
|
257 |
|
|
|
258 |
sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm,
|
|
1190
|
259 |
Index: firefox-115.0/intl/icu/source/i18n/number_rounding.cpp
|
|
|
260 |
===================================================================
|
|
|
261 |
--- firefox-115.0.orig/intl/icu/source/i18n/number_rounding.cpp
|
|
|
262 |
+++ firefox-115.0/intl/icu/source/i18n/number_rounding.cpp
|
|
|
263 |
@@ -283,6 +283,7 @@ FractionPrecision Precision::constructFr
|
|
1175
|
264 |
settings.fMaxFrac = static_cast<digits_t>(maxFrac);
|
|
|
265 |
settings.fMinSig = -1;
|
|
|
266 |
settings.fMaxSig = -1;
|
|
|
267 |
+ settings.fPriority = UNUM_ROUNDING_PRIORITY_RELAXED;
|
|
|
268 |
PrecisionUnion union_;
|
|
|
269 |
union_.fracSig = settings;
|
|
|
270 |
return {RND_FRACTION, union_};
|
|
1190
|
271 |
@@ -294,6 +295,7 @@ Precision Precision::constructSignifican
|
|
1175
|
272 |
settings.fMaxFrac = -1;
|
|
|
273 |
settings.fMinSig = static_cast<digits_t>(minSig);
|
|
|
274 |
settings.fMaxSig = static_cast<digits_t>(maxSig);
|
|
|
275 |
+ settings.fPriority = UNUM_ROUNDING_PRIORITY_RELAXED;
|
|
|
276 |
PrecisionUnion union_;
|
|
|
277 |
union_.fracSig = settings;
|
|
|
278 |
return {RND_SIGNIFICANT, union_};
|
|
1190
|
279 |
Index: firefox-115.0/js/src/irregexp/imported/regexp-parser.cc
|
|
|
280 |
===================================================================
|
|
|
281 |
--- firefox-115.0.orig/js/src/irregexp/imported/regexp-parser.cc
|
|
|
282 |
+++ firefox-115.0/js/src/irregexp/imported/regexp-parser.cc
|
|
|
283 |
@@ -2656,6 +2656,7 @@ bool MayContainStrings(ClassSetOperandTy
|
|
|
284 |
if (operand->IsClassRanges()) return false;
|
|
|
285 |
return operand->AsClassSetExpression()->may_contain_strings();
|
|
|
286 |
}
|
|
|
287 |
+ UNREACHABLE();
|
|
1177
|
288 |
}
|
|
|
289 |
|
|
1190
|
290 |
} // namespace
|
|
|
291 |
Index: firefox-115.0/third_party/libwebrtc/api/adaptation/resource.cc
|
|
|
292 |
===================================================================
|
|
|
293 |
--- firefox-115.0.orig/third_party/libwebrtc/api/adaptation/resource.cc
|
|
|
294 |
+++ firefox-115.0/third_party/libwebrtc/api/adaptation/resource.cc
|
|
|
295 |
@@ -22,6 +22,7 @@ const char* ResourceUsageStateToString(R
|
|
1175
|
296 |
return "kUnderuse";
|
|
|
297 |
}
|
|
1180
|
298 |
RTC_CHECK_NOTREACHED();
|
|
|
299 |
+ return nullptr;
|
|
1175
|
300 |
}
|
|
|
301 |
|
|
1177
|
302 |
ResourceListener::~ResourceListener() {}
|
|
1190
|
303 |
Index: firefox-115.0/third_party/libwebrtc/api/rtp_parameters.cc
|
|
|
304 |
===================================================================
|
|
|
305 |
--- firefox-115.0.orig/third_party/libwebrtc/api/rtp_parameters.cc
|
|
|
306 |
+++ firefox-115.0/third_party/libwebrtc/api/rtp_parameters.cc
|
|
|
307 |
@@ -32,6 +32,7 @@ const char* DegradationPreferenceToStrin
|
|
1175
|
308 |
return "balanced";
|
|
|
309 |
}
|
|
1180
|
310 |
RTC_CHECK_NOTREACHED();
|
|
|
311 |
+ return "";
|
|
1175
|
312 |
}
|
|
|
313 |
|
|
1177
|
314 |
const double kDefaultBitratePriority = 1.0;
|
|
1190
|
315 |
Index: firefox-115.0/third_party/libwebrtc/api/video/video_frame_buffer.cc
|
|
|
316 |
===================================================================
|
|
|
317 |
--- firefox-115.0.orig/third_party/libwebrtc/api/video/video_frame_buffer.cc
|
|
|
318 |
+++ firefox-115.0/third_party/libwebrtc/api/video/video_frame_buffer.cc
|
|
|
319 |
@@ -106,6 +106,8 @@ const char* VideoFrameBufferTypeToString
|
|
1180
|
320 |
default:
|
|
|
321 |
RTC_DCHECK_NOTREACHED();
|
|
|
322 |
}
|
|
|
323 |
+ RTC_DCHECK_NOTREACHED();
|
|
|
324 |
+ return nullptr;
|
|
|
325 |
}
|
|
|
326 |
|
|
|
327 |
int I420BufferInterface::ChromaWidth() const {
|
|
1190
|
328 |
Index: firefox-115.0/third_party/libwebrtc/api/video_codecs/video_codec.cc
|
|
|
329 |
===================================================================
|
|
|
330 |
--- firefox-115.0.orig/third_party/libwebrtc/api/video_codecs/video_codec.cc
|
|
|
331 |
+++ firefox-115.0/third_party/libwebrtc/api/video_codecs/video_codec.cc
|
|
|
332 |
@@ -118,6 +118,7 @@ const char* CodecTypeToPayloadString(Vid
|
|
1175
|
333 |
return kPayloadNameGeneric;
|
|
|
334 |
}
|
|
1180
|
335 |
RTC_CHECK_NOTREACHED();
|
|
|
336 |
+ return "";
|
|
1175
|
337 |
}
|
|
|
338 |
|
|
1177
|
339 |
VideoCodecType PayloadStringToCodecType(const std::string& name) {
|
|
1190
|
340 |
Index: firefox-115.0/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc
|
|
|
341 |
===================================================================
|
|
|
342 |
--- firefox-115.0.orig/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc
|
|
|
343 |
+++ firefox-115.0/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc
|
|
|
344 |
@@ -163,6 +163,7 @@ class VideoEncoderSoftwareFallbackWrappe
|
|
1175
|
345 |
return fallback_encoder_.get();
|
|
|
346 |
}
|
|
1180
|
347 |
RTC_CHECK_NOTREACHED();
|
|
|
348 |
+ return nullptr;
|
|
1175
|
349 |
}
|
|
|
350 |
|
|
1177
|
351 |
// Updates encoder with last observed parameters, such as callbacks, rates,
|
|
1190
|
352 |
@@ -343,6 +344,7 @@ int32_t VideoEncoderSoftwareFallbackWrap
|
|
1175
|
353 |
return fallback_encoder_->Encode(frame, frame_types);
|
|
|
354 |
}
|
|
1180
|
355 |
RTC_CHECK_NOTREACHED();
|
|
|
356 |
+ return WEBRTC_VIDEO_CODEC_ERROR;
|
|
1175
|
357 |
}
|
|
1180
|
358 |
|
|
1175
|
359 |
int32_t VideoEncoderSoftwareFallbackWrapper::EncodeWithMainEncoder(
|
|
1190
|
360 |
Index: firefox-115.0/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc
|
|
|
361 |
===================================================================
|
|
|
362 |
--- firefox-115.0.orig/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc
|
|
|
363 |
+++ firefox-115.0/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc
|
|
|
364 |
@@ -168,6 +168,7 @@ const char* Adaptation::StatusToString(A
|
|
1175
|
365 |
return "kRejectedByConstraint";
|
|
|
366 |
}
|
|
1180
|
367 |
RTC_CHECK_NOTREACHED();
|
|
|
368 |
+ return "";
|
|
1175
|
369 |
}
|
|
|
370 |
|
|
1177
|
371 |
Adaptation::Adaptation(int validation_id,
|
|
1190
|
372 |
@@ -390,6 +391,7 @@ VideoStreamAdapter::RestrictionsOrState
|
|
1175
|
373 |
return Adaptation::Status::kAdaptationDisabled;
|
|
|
374 |
}
|
|
1180
|
375 |
RTC_CHECK_NOTREACHED();
|
|
|
376 |
+ return Adaptation::Status::kAdaptationDisabled;
|
|
1175
|
377 |
}
|
|
|
378 |
|
|
1177
|
379 |
Adaptation VideoStreamAdapter::GetAdaptationDown() {
|
|
1190
|
380 |
@@ -472,6 +474,7 @@ VideoStreamAdapter::GetAdaptationDownSte
|
|
1175
|
381 |
return Adaptation::Status::kAdaptationDisabled;
|
|
|
382 |
}
|
|
1180
|
383 |
RTC_CHECK_NOTREACHED();
|
|
|
384 |
+ return Adaptation::Status::kAdaptationDisabled;
|
|
1175
|
385 |
}
|
|
|
386 |
|
|
1177
|
387 |
VideoStreamAdapter::RestrictionsOrState VideoStreamAdapter::DecreaseResolution(
|
|
1190
|
388 |
@@ -625,6 +628,8 @@ Adaptation VideoStreamAdapter::GetAdaptD
|
|
1175
|
389 |
}
|
|
|
390 |
}
|
|
1180
|
391 |
RTC_CHECK_NOTREACHED();
|
|
|
392 |
+ return RestrictionsOrStateToAdaptation(
|
|
|
393 |
+ Adaptation::Status::kAdaptationDisabled, input_state);
|
|
1175
|
394 |
}
|
|
|
395 |
|
|
1177
|
396 |
VideoStreamAdapter::RestrictionsOrState
|
|
1190
|
397 |
Index: firefox-115.0/third_party/libwebrtc/call/rtp_payload_params.cc
|
|
|
398 |
===================================================================
|
|
|
399 |
--- firefox-115.0.orig/third_party/libwebrtc/call/rtp_payload_params.cc
|
|
|
400 |
+++ firefox-115.0/third_party/libwebrtc/call/rtp_payload_params.cc
|
|
|
401 |
@@ -407,7 +407,7 @@ absl::optional<FrameDependencyStructure>
|
|
|
402 |
case VideoCodecType::kVideoCodecMultiplex:
|
|
|
403 |
return absl::nullopt;
|
|
|
404 |
}
|
|
|
405 |
- RTC_DCHECK_NOTREACHED() << "Unsupported codec.";
|
|
|
406 |
+ RTC_CHECK_NOTREACHED();
|
|
|
407 |
}
|
|
|
408 |
|
|
|
409 |
void RtpPayloadParams::GenericToGeneric(int64_t shared_frame_id,
|
|
|
410 |
Index: firefox-115.0/third_party/libwebrtc/call/video_send_stream.cc
|
|
|
411 |
===================================================================
|
|
|
412 |
--- firefox-115.0.orig/third_party/libwebrtc/call/video_send_stream.cc
|
|
|
413 |
+++ firefox-115.0/third_party/libwebrtc/call/video_send_stream.cc
|
|
|
414 |
@@ -30,6 +30,7 @@ const char* StreamTypeToString(VideoSend
|
|
1175
|
415 |
return "flexfec";
|
|
|
416 |
}
|
|
1180
|
417 |
RTC_CHECK_NOTREACHED();
|
|
|
418 |
+ return "";
|
|
1175
|
419 |
}
|
|
|
420 |
|
|
1177
|
421 |
} // namespace
|
|
1190
|
422 |
Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc
|
|
|
423 |
===================================================================
|
|
|
424 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc
|
|
|
425 |
+++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc
|
|
|
426 |
@@ -378,7 +378,7 @@ std::unique_ptr<ClippingPredictor> Creat
|
|
|
427 |
config.reference_window_delay, config.clipping_threshold,
|
|
|
428 |
/*adaptive_step_estimation=*/false);
|
|
|
429 |
}
|
|
|
430 |
- RTC_DCHECK_NOTREACHED();
|
|
|
431 |
+ RTC_CHECK_NOTREACHED();
|
|
|
432 |
}
|
|
1177
|
433 |
|
|
1190
|
434 |
} // namespace webrtc
|
|
|
435 |
Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc
|
|
|
436 |
===================================================================
|
|
|
437 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc
|
|
|
438 |
+++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc
|
|
|
439 |
@@ -48,6 +48,7 @@ constexpr absl::string_view MetricNamePr
|
|
|
440 |
case InputVolumeType::kRecommended:
|
|
|
441 |
return "WebRTC.Audio.Apm.RecommendedInputVolume.";
|
|
|
442 |
}
|
|
|
443 |
+ RTC_CHECK_NOTREACHED();
|
|
|
444 |
}
|
|
|
445 |
|
|
|
446 |
metrics::Histogram* CreateVolumeHistogram(InputVolumeType input_volume_type) {
|
|
|
447 |
Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
|
|
|
448 |
===================================================================
|
|
|
449 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
|
|
|
450 |
+++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
|
|
|
451 |
@@ -59,6 +59,8 @@ rtc::FunctionView<float(float)> GetActiv
|
|
1180
|
452 |
case ActivationFunction::kSigmoidApproximated:
|
|
|
453 |
return ::rnnoise::SigmoidApproximated;
|
|
|
454 |
}
|
|
|
455 |
+ // supposed to be never reached apparently therefore returning bogus
|
|
|
456 |
+ return ::rnnoise::TansigApproximated;
|
|
|
457 |
}
|
|
1177
|
458 |
|
|
1180
|
459 |
} // namespace
|
|
1190
|
460 |
Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc
|
|
|
461 |
===================================================================
|
|
|
462 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc
|
|
|
463 |
+++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc
|
|
|
464 |
@@ -99,6 +99,7 @@ GainControl::Mode Agc1ConfigModeToInterf
|
|
1175
|
465 |
return GainControl::kFixedDigital;
|
|
|
466 |
}
|
|
1180
|
467 |
RTC_CHECK_NOTREACHED();
|
|
|
468 |
+ return GainControl::kAdaptiveAnalog;
|
|
|
469 |
}
|
|
|
470 |
|
|
|
471 |
bool MinimizeProcessingForUnusedOutput() {
|
|
1190
|
472 |
@@ -166,7 +167,7 @@ int AudioFormatValidityToErrorCode(Audio
|
|
|
473 |
case AudioFormatValidity::kInvalidChannelCount:
|
|
|
474 |
return AudioProcessing::kBadNumberChannelsError;
|
|
|
475 |
}
|
|
|
476 |
- RTC_DCHECK(false);
|
|
|
477 |
+ RTC_CHECK_NOTREACHED();
|
|
1175
|
478 |
}
|
|
|
479 |
|
|
1190
|
480 |
// Returns an AudioProcessing::Error together with the best possible option for
|
|
|
481 |
@@ -2421,6 +2422,7 @@ void AudioProcessingImpl::InitializeNois
|
|
1175
|
482 |
return NsConfig::SuppressionLevel::k21dB;
|
|
|
483 |
}
|
|
1180
|
484 |
RTC_CHECK_NOTREACHED();
|
|
|
485 |
+ return NsConfig::SuppressionLevel::k6dB;
|
|
1175
|
486 |
};
|
|
|
487 |
|
|
1177
|
488 |
NsConfig cfg;
|
|
1190
|
489 |
Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc
|
|
|
490 |
===================================================================
|
|
|
491 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc
|
|
|
492 |
+++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc
|
|
|
493 |
@@ -32,6 +32,7 @@ std::string NoiseSuppressionLevelToStrin
|
|
1175
|
494 |
return "VeryHigh";
|
|
|
495 |
}
|
|
1180
|
496 |
RTC_CHECK_NOTREACHED();
|
|
|
497 |
+ return "";
|
|
1175
|
498 |
}
|
|
|
499 |
|
|
1180
|
500 |
std::string GainController1ModeToString(const Agc1Config::Mode& mode) {
|
|
1190
|
501 |
@@ -44,6 +45,7 @@ std::string GainController1ModeToString(
|
|
1180
|
502 |
return "FixedDigital";
|
|
1175
|
503 |
}
|
|
1180
|
504 |
RTC_CHECK_NOTREACHED();
|
|
|
505 |
+ return "";
|
|
1175
|
506 |
}
|
|
|
507 |
|
|
1177
|
508 |
} // namespace
|
|
1190
|
509 |
Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc
|
|
|
510 |
===================================================================
|
|
|
511 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc
|
|
|
512 |
+++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc
|
|
|
513 |
@@ -53,6 +53,7 @@ std::string GetVadModeLabel(TransientSup
|
|
|
514 |
case TransientSuppressor::VadMode::kNoVad:
|
|
|
515 |
return "no VAD";
|
|
|
516 |
}
|
|
|
517 |
+ RTC_CHECK_NOTREACHED();
|
|
|
518 |
}
|
|
1180
|
519 |
|
|
1190
|
520 |
} // namespace
|
|
|
521 |
Index: firefox-115.0/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc
|
|
|
522 |
===================================================================
|
|
|
523 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc
|
|
|
524 |
+++ firefox-115.0/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc
|
|
|
525 |
@@ -44,6 +44,7 @@ ScreenCastPortal::CaptureSourceType Scre
|
|
|
526 |
case CaptureType::kAnyScreenContent:
|
|
|
527 |
return ScreenCastPortal::CaptureSourceType::kAnyScreenContent;
|
|
|
528 |
}
|
|
|
529 |
+ RTC_CHECK_NOTREACHED();
|
|
|
530 |
}
|
|
|
531 |
|
|
|
532 |
ScreenCastPortal::ScreenCastPortal(CaptureType type, PortalNotifier* notifier)
|
|
|
533 |
Index: firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc
|
|
|
534 |
===================================================================
|
|
|
535 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc
|
|
|
536 |
+++ firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc
|
|
|
537 |
@@ -38,6 +38,7 @@ std::unique_ptr<VideoRtpDepacketizer> Cr
|
|
1175
|
538 |
return std::make_unique<VideoRtpDepacketizerGeneric>();
|
|
|
539 |
}
|
|
1180
|
540 |
RTC_CHECK_NOTREACHED();
|
|
|
541 |
+ return nullptr;
|
|
1175
|
542 |
}
|
|
|
543 |
|
|
1177
|
544 |
} // namespace webrtc
|
|
1190
|
545 |
Index: firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
|
|
546 |
===================================================================
|
|
|
547 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
|
|
548 |
+++ firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc
|
|
|
549 |
@@ -142,6 +142,7 @@ bool IsNonVolatile(RTPExtensionType type
|
|
1180
|
550 |
#endif
|
|
1175
|
551 |
}
|
|
1180
|
552 |
RTC_CHECK_NOTREACHED();
|
|
|
553 |
+ return false;
|
|
1175
|
554 |
}
|
|
|
555 |
|
|
1177
|
556 |
bool HasBweExtension(const RtpHeaderExtensionMap& extensions_map) {
|
|
1190
|
557 |
Index: firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
|
|
|
558 |
===================================================================
|
|
|
559 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
|
|
|
560 |
+++ firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc
|
|
|
561 |
@@ -45,6 +45,7 @@ namespace {
|
|
1175
|
562 |
return "audio_cn";
|
|
|
563 |
}
|
|
1180
|
564 |
RTC_CHECK_NOTREACHED();
|
|
|
565 |
+ return "";
|
|
1175
|
566 |
}
|
|
1177
|
567 |
|
|
|
568 |
constexpr char kIncludeCaptureClockOffset[] =
|
|
1190
|
569 |
Index: firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
|
|
|
570 |
===================================================================
|
|
|
571 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
|
|
|
572 |
+++ firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
|
|
|
573 |
@@ -110,6 +110,7 @@ size_t BufferToIndex(Vp8BufferReference
|
|
|
574 |
case Vp8FrameConfig::Vp8BufferReference::kNone:
|
|
|
575 |
RTC_CHECK_NOTREACHED();
|
|
|
576 |
}
|
|
|
577 |
+ RTC_CHECK_NOTREACHED();
|
|
|
578 |
}
|
|
1177
|
579 |
|
|
|
580 |
} // namespace
|
|
1190
|
581 |
Index: firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc
|
|
|
582 |
===================================================================
|
|
|
583 |
--- firefox-115.0.orig/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc
|
|
|
584 |
+++ firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc
|
|
|
585 |
@@ -30,6 +30,7 @@ TemporalLayersChecker::CreateTemporalLay
|
|
1175
|
586 |
return std::make_unique<TemporalLayersChecker>(num_temporal_layers);
|
|
|
587 |
}
|
|
1180
|
588 |
RTC_CHECK_NOTREACHED();
|
|
|
589 |
+ return nullptr;
|
|
1175
|
590 |
}
|
|
|
591 |
|
|
1177
|
592 |
TemporalLayersChecker::TemporalLayersChecker(int num_temporal_layers)
|
|
1190
|
593 |
Index: firefox-115.0/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc
|
|
|
594 |
===================================================================
|
|
|
595 |
--- firefox-115.0.orig/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc
|
|
|
596 |
+++ firefox-115.0/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc
|
|
|
597 |
@@ -63,6 +63,7 @@ std::string ToString(VideoAdaptationReas
|
|
1175
|
598 |
return "cpu";
|
|
|
599 |
}
|
|
1180
|
600 |
RTC_CHECK_NOTREACHED();
|
|
|
601 |
+ return "";
|
|
1175
|
602 |
}
|
|
|
603 |
|
|
1180
|
604 |
std::vector<bool> GetActiveLayersFlags(const VideoCodec& codec) {
|