diff --git a/media/libcubeb/disable-assert.patch b/media/libcubeb/disable-assert.patch new file mode 100644 index 000000000000..6fae3a76633b --- /dev/null +++ b/media/libcubeb/disable-assert.patch @@ -0,0 +1,23 @@ +diff --git a/media/libcubeb/src/cubeb_resampler.cpp b/media/libcubeb/src/cubeb_resampler.cpp +--- a/media/libcubeb/src/cubeb_resampler.cpp ++++ b/media/libcubeb/src/cubeb_resampler.cpp +@@ -50,18 +50,17 @@ passthrough_resampler::passthrough_re + + template + long passthrough_resampler::fill(void * input_buffer, long * input_frames_count, + void * output_buffer, long output_frames) + { + if (input_buffer) { + assert(input_frames_count); + } +- assert((input_buffer && output_buffer && +- *input_frames_count + static_cast(samples_to_frames(internal_input_buffer.length())) >= output_frames) || ++ assert((input_buffer && output_buffer) || + (output_buffer && !input_buffer && (!input_frames_count || *input_frames_count == 0)) || + (input_buffer && !output_buffer && output_frames == 0)); + + if (input_buffer) { + if (!output_buffer) { + output_frames = *input_frames_count; + } + internal_input_buffer.push(static_cast(input_buffer), diff --git a/media/libcubeb/src/cubeb_resampler.cpp b/media/libcubeb/src/cubeb_resampler.cpp index f4ea8a9f5f0c..01075a86dd1b 100644 --- a/media/libcubeb/src/cubeb_resampler.cpp +++ b/media/libcubeb/src/cubeb_resampler.cpp @@ -55,8 +55,7 @@ long passthrough_resampler::fill(void * input_buffer, long * input_frames_cou if (input_buffer) { assert(input_frames_count); } - assert((input_buffer && output_buffer && - *input_frames_count + static_cast(samples_to_frames(internal_input_buffer.length())) >= output_frames) || + assert((input_buffer && output_buffer) || (output_buffer && !input_buffer && (!input_frames_count || *input_frames_count == 0)) || (input_buffer && !output_buffer && output_frames == 0)); diff --git a/media/libcubeb/update.sh b/media/libcubeb/update.sh index 791cadae117d..0f348ddecdfc 100755 --- a/media/libcubeb/update.sh +++ b/media/libcubeb/update.sh @@ -69,3 +69,6 @@ fi echo "Applying a patch on top of $rev" patch -p3 < temp-patch-debug-drift.patch + +echo "Applying a patch on top of $rev" +patch -p3 < disable-assert.patch