diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-10-27 19:40:52 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-11-02 23:02:42 -0400 |
| commit | d162ecbaffe845c9707da5d2f6cab11f343ef00e (patch) | |
| tree | 0f4312565334c3dc0f167c5648508c150d2c5dec /media/libcubeb/disable-assert.patch | |
| parent | 21b3f6247403c06f85e1f45d219f87549862198f (diff) | |
| download | UXP-d162ecbaffe845c9707da5d2f6cab11f343ef00e.tar UXP-d162ecbaffe845c9707da5d2f6cab11f343ef00e.tar.gz UXP-d162ecbaffe845c9707da5d2f6cab11f343ef00e.tar.lz UXP-d162ecbaffe845c9707da5d2f6cab11f343ef00e.tar.xz UXP-d162ecbaffe845c9707da5d2f6cab11f343ef00e.zip | |
Issue #1267 - Part 1: Update libcubeb to a1200c34.
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), |