Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1337641 - Temporarily disable an assert in cubeb duplex. r=achronop

Browse Source 
MozReview-Commit-ID: GD57nZRoXFj

--HG--
extra : rebase_source : 638d4e3f38fb3f4989758f0f1ad7f9d5dc4680ab
This commit is contained in:
Paul Adenot 2017-04-10 19:26:44 +02:00
parent 6fea222c62
commit b37280c289
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
media/libcubeb/disable-assert.patch Normal file
View File

@ -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),

3
media/libcubeb/src/cubeb_resampler.cpp
View File

@ -55,8 +55,7 @@ long passthrough_resampler<T>::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<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));

3
media/libcubeb/update.sh
View File

@ -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