зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1663917 - Remove patch to disable an assertion in cubeb, it's now upstream. r=kinetik
Differential Revision: https://phabricator.services.mozilla.com/D89589
This commit is contained in:
Родитель
794c47608e
Коммит
25a676aa1b
|
@ -1,22 +0,0 @@
|
|||
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();
|
||||
}
|
|
@ -83,6 +83,3 @@ if [ -n "$rev" ]; then
|
|||
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
|
||||
|
|
Загрузка…
Ссылка в новой задаче