Bug 1631724 - Temporarily disable an assert inside the cubeb's resampler. r=achronop
authorPaul Adenot <paul@paul.cx>
Thu, 28 May 2020 09:55:21 +0000
changeset 532730 17fc3a2a42b5d725e99c51de4b4dda8061415fab
parent 532729 2275abe97e96b464c5c6763cd8c85d116210172a
child 532731 5e969a4bab421cfb0c9c6816eafd46a3eeb147f5
push id37457
push usernerli@mozilla.com
push dateThu, 28 May 2020 15:51:15 +0000
treeherdermozilla-central@272e3c98d002 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersachronop
bugs1631724, 1641234
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1631724 - Temporarily disable an assert inside the cubeb's resampler. r=achronop Reenabling is tracked in https://bugzilla.mozilla.org/show_bug.cgi?id=1641234 Differential Revision: https://phabricator.services.mozilla.com/D77064
media/libcubeb/disable-assert.patch
media/libcubeb/src/cubeb_resampler_internal.h
media/libcubeb/update.sh
new file mode 100644
--- /dev/null
+++ b/media/libcubeb/disable-assert.patch
@@ -0,0 +1,22 @@
+diff --git a/media/libcubeb/src/cubeb_resampler_internal.h b/media/libcubeb/src/cubeb_resampler_internal.h
+--- a/media/libcubeb/src/cubeb_resampler_internal.h
++++ b/media/libcubeb/src/cubeb_resampler_internal.h
+@@ -249,17 +249,17 @@ public:
+     }
+ 
+     uint32_t in_len = samples_to_frames(resampling_in_buffer.length());
+     uint32_t out_len = output_frame_count;
+ 
+     speex_resample(resampling_in_buffer.data(), &in_len,
+                    resampling_out_buffer.data(), &out_len);
+ 
+-    assert(out_len == output_frame_count);
++    // assert(out_len == output_frame_count);
+ 
+     /* This shifts back any unresampled samples to the beginning of the input
+        buffer. */
+     resampling_in_buffer.pop(nullptr, frames_to_samples(in_len));
+     *input_frames_used = in_len;
+ 
+     return resampling_out_buffer.data();
+   }
--- a/media/libcubeb/src/cubeb_resampler_internal.h
+++ b/media/libcubeb/src/cubeb_resampler_internal.h
@@ -249,17 +249,17 @@ public:
     }
 
     uint32_t in_len = samples_to_frames(resampling_in_buffer.length());
     uint32_t out_len = output_frame_count;
 
     speex_resample(resampling_in_buffer.data(), &in_len,
                    resampling_out_buffer.data(), &out_len);
 
-    assert(out_len == output_frame_count);
+    // assert(out_len == output_frame_count);
 
     /* This shifts back any unresampled samples to the beginning of the input
        buffer. */
     resampling_in_buffer.pop(nullptr, frames_to_samples(in_len));
     *input_frames_used = in_len;
 
     return resampling_out_buffer.data();
   }
--- a/media/libcubeb/update.sh
+++ b/media/libcubeb/update.sh
@@ -79,8 +79,10 @@ if [ -n "$rev" ]; then
     exit 1
   fi
   rm moz.yaml.bak
   [[ -n "$commits" ]] && echo -e "Pick commits:\n$commits"
 else
   echo "Remember to update moz.yaml with the version details."
 fi
 
+echo "Applying a patch on top of $rev"
+patch -p3 < ./disable-assert.patch