diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-03 11:20:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 11:20:08 +0100 |
| commit | b7c6c779ee1d0100842822a1a9c63cd97d27644b (patch) | |
| tree | cd6504982a432efda7dcd0b5208efde4c04847b1 /media/libcubeb/disable-assert.patch | |
| parent | 21b3f6247403c06f85e1f45d219f87549862198f (diff) | |
| parent | 22b35fa8e923d52a3fa785993c28c3e63cd1ee1e (diff) | |
| download | UXP-b7c6c779ee1d0100842822a1a9c63cd97d27644b.tar UXP-b7c6c779ee1d0100842822a1a9c63cd97d27644b.tar.gz UXP-b7c6c779ee1d0100842822a1a9c63cd97d27644b.tar.lz UXP-b7c6c779ee1d0100842822a1a9c63cd97d27644b.tar.xz UXP-b7c6c779ee1d0100842822a1a9c63cd97d27644b.zip | |
Merge pull request #1270 from g4jc/libcubeb
Update libcubeb
Diffstat (limited to 'media/libcubeb/disable-assert.patch')
| -rw-r--r-- | media/libcubeb/disable-assert.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/media/libcubeb/disable-assert.patch b/media/libcubeb/disable-assert.patch new file mode 100644 index 000000000..6fae3a766 --- /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<T>::passthrough_re + + template<typename T> + long passthrough_resampler<T>::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<int>(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<T*>(input_buffer), |