Merge branch 'secondlife' of https://github.com/secondlife/2p-webrtc-…

…build into secondlife
AlchemyViewer · Jun 30, 2024 · e2189ca · e2189ca
2 parents 14270f7 + d5d4352
commit e2189ca
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/build/patches/bug_8759_workaround.patch 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
@@ -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,27 +215,31 @@ 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': [
         'add_license_dav1d.patch',
         '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': [
         'add_license_dav1d.patch',
         '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': [
         'add_license_dav1d.patch',
         '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',
     ],
 }