diff --git a/build/patches/bug_8759_workaround.patch b/build/patches/bug_8759_workaround.patch new file mode 100644 index 0000000..3ef46bb --- /dev/null +++ b/build/patches/bug_8759_workaround.patch @@ -0,0 +1,13 @@ +diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc +index e8e2175994..cc4aa65f0f 100644 +--- a/modules/audio_processing/aec3/echo_canceller3.cc ++++ b/modules/audio_processing/aec3/echo_canceller3.cc +@@ -696,7 +696,7 @@ EchoCanceller3::RenderWriter::~RenderWriter() = default; + + void EchoCanceller3::RenderWriter::Insert(const AudioBuffer& input) { + RTC_DCHECK_EQ(AudioBuffer::kSplitBandSize, input.num_frames_per_band()); +- RTC_DCHECK_EQ(num_bands_, input.num_bands()); ++ // RTC_DCHECK_EQ(num_bands_, input.num_bands()); // commented as per bugs.webrtc.org/8759 + RTC_DCHECK_EQ(num_channels_, input.num_channels()); + + // TODO(bugs.webrtc.org/8759) Temporary work-around. diff --git a/build/run.py b/build/run.py index 4232286..465b750 100644 --- a/build/run.py +++ b/build/run.py @@ -184,6 +184,7 @@ def get_depot_tools(source_dir, fetch=False): 'fix_mocks.patch', 'is_pod-is-deprecated.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'msvc-checks-template.patch', 'disable_mute_of_audio_processing.patch', ], @@ -194,6 +195,7 @@ def get_depot_tools(source_dir, fetch=False): 'fix_mocks.patch', 'is_pod-is-deprecated.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'msvc-checks-template.patch', 'disable_mute_of_audio_processing.patch', ], @@ -204,6 +206,7 @@ def get_depot_tools(source_dir, fetch=False): 'fix_mocks.patch', 'is_pod-is-deprecated.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'msvc-checks-template.patch' 'disable_mute_of_audio_processing.patch', ], @@ -212,6 +215,7 @@ def get_depot_tools(source_dir, fetch=False): 'fix_mocks.patch', 'macos_h264_encoder.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'macos_arm64': [ @@ -219,6 +223,7 @@ def get_depot_tools(source_dir, fetch=False): 'fix_mocks.patch', 'macos_h264_encoder.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'ios': [ @@ -226,6 +231,7 @@ def get_depot_tools(source_dir, fetch=False): 'fix_mocks.patch', 'macos_h264_encoder.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'android': [ @@ -233,6 +239,7 @@ def get_depot_tools(source_dir, fetch=False): 'android_webrtc_version.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'android_prefixed': [ @@ -246,48 +253,56 @@ def get_depot_tools(source_dir, fetch=False): 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'raspberry-pi-os_armv7': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'raspberry-pi-os_armv8': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'ubuntu-18.04_armv8': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'ubuntu-20.04_armv8': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'ubuntu-18.04_x86_64': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'ubuntu-20.04_x86_64': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], 'ubuntu-22.04_x86_64': [ 'add_license_dav1d.patch', 'fix_mocks.patch', 'upsample-to-48khz-for-echo-cancellation-for-now.patch', + 'bug_8759_workaround.patch', 'disable_mute_of_audio_processing.patch', ], }