Skip to content

Commit 9491708

Browse files
committed
workaround abort on temporary echo bands mismatch (bug 8759)
1 parent 1666bf3 commit 9491708

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

build/bug_8759_workaround.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc
2+
index e8e2175994..cc4aa65f0f 100644
3+
--- a/modules/audio_processing/aec3/echo_canceller3.cc
4+
+++ b/modules/audio_processing/aec3/echo_canceller3.cc
5+
@@ -696,7 +696,7 @@ EchoCanceller3::RenderWriter::~RenderWriter() = default;
6+
7+
void EchoCanceller3::RenderWriter::Insert(const AudioBuffer& input) {
8+
RTC_DCHECK_EQ(AudioBuffer::kSplitBandSize, input.num_frames_per_band());
9+
- RTC_DCHECK_EQ(num_bands_, input.num_bands());
10+
+ // RTC_DCHECK_EQ(num_bands_, input.num_bands()); // commented as per bugs.webrtc.org/8759
11+
RTC_DCHECK_EQ(num_channels_, input.num_channels());
12+
13+
// TODO(bugs.webrtc.org/8759) Temporary work-around.

build/run.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ def get_depot_tools(source_dir, fetch=False):
184184
'fix_mocks.patch',
185185
'is_pod-is-deprecated.patch',
186186
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
187+
'bug_8759_workaround.patch',
187188
'msvc-checks-template.patch',
188189
'disable_mute_of_audio_processing.patch',
189190
],
@@ -194,6 +195,7 @@ def get_depot_tools(source_dir, fetch=False):
194195
'fix_mocks.patch',
195196
'is_pod-is-deprecated.patch',
196197
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
198+
'bug_8759_workaround.patch',
197199
'msvc-checks-template.patch',
198200
'disable_mute_of_audio_processing.patch',
199201
],
@@ -204,6 +206,7 @@ def get_depot_tools(source_dir, fetch=False):
204206
'fix_mocks.patch',
205207
'is_pod-is-deprecated.patch',
206208
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
209+
'bug_8759_workaround.patch',
207210
'msvc-checks-template.patch'
208211
'disable_mute_of_audio_processing.patch',
209212
],
@@ -212,27 +215,31 @@ def get_depot_tools(source_dir, fetch=False):
212215
'fix_mocks.patch',
213216
'macos_h264_encoder.patch',
214217
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
218+
'bug_8759_workaround.patch',
215219
'disable_mute_of_audio_processing.patch',
216220
],
217221
'macos_arm64': [
218222
'add_license_dav1d.patch',
219223
'fix_mocks.patch',
220224
'macos_h264_encoder.patch',
221225
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
226+
'bug_8759_workaround.patch',
222227
'disable_mute_of_audio_processing.patch',
223228
],
224229
'ios': [
225230
'add_license_dav1d.patch',
226231
'fix_mocks.patch',
227232
'macos_h264_encoder.patch',
228233
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
234+
'bug_8759_workaround.patch',
229235
'disable_mute_of_audio_processing.patch',
230236
],
231237
'android': [
232238
'add_license_dav1d.patch',
233239
'android_webrtc_version.patch',
234240
'fix_mocks.patch',
235241
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
242+
'bug_8759_workaround.patch',
236243
'disable_mute_of_audio_processing.patch',
237244
],
238245
'android_prefixed': [
@@ -246,48 +253,56 @@ def get_depot_tools(source_dir, fetch=False):
246253
'add_license_dav1d.patch',
247254
'fix_mocks.patch',
248255
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
256+
'bug_8759_workaround.patch',
249257
'disable_mute_of_audio_processing.patch',
250258
],
251259
'raspberry-pi-os_armv7': [
252260
'add_license_dav1d.patch',
253261
'fix_mocks.patch',
254262
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
263+
'bug_8759_workaround.patch',
255264
'disable_mute_of_audio_processing.patch',
256265
],
257266
'raspberry-pi-os_armv8': [
258267
'add_license_dav1d.patch',
259268
'fix_mocks.patch',
260269
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
270+
'bug_8759_workaround.patch',
261271
'disable_mute_of_audio_processing.patch',
262272
],
263273
'ubuntu-18.04_armv8': [
264274
'add_license_dav1d.patch',
265275
'fix_mocks.patch',
266276
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
277+
'bug_8759_workaround.patch',
267278
'disable_mute_of_audio_processing.patch',
268279
],
269280
'ubuntu-20.04_armv8': [
270281
'add_license_dav1d.patch',
271282
'fix_mocks.patch',
272283
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
284+
'bug_8759_workaround.patch',
273285
'disable_mute_of_audio_processing.patch',
274286
],
275287
'ubuntu-18.04_x86_64': [
276288
'add_license_dav1d.patch',
277289
'fix_mocks.patch',
278290
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
291+
'bug_8759_workaround.patch',
279292
'disable_mute_of_audio_processing.patch',
280293
],
281294
'ubuntu-20.04_x86_64': [
282295
'add_license_dav1d.patch',
283296
'fix_mocks.patch',
284297
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
298+
'bug_8759_workaround.patch',
285299
'disable_mute_of_audio_processing.patch',
286300
],
287301
'ubuntu-22.04_x86_64': [
288302
'add_license_dav1d.patch',
289303
'fix_mocks.patch',
290304
'upsample-to-48khz-for-echo-cancellation-for-now.patch',
305+
'bug_8759_workaround.patch',
291306
'disable_mute_of_audio_processing.patch',
292307
],
293308
}

0 commit comments

Comments
 (0)