45 lines
2.3 KiB
Diff
45 lines
2.3 KiB
Diff
diff -ur firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs
|
|
--- firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs 2018-10-02 02:35:25.000000000 +0800
|
|
+++ firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs 2020-05-22 12:46:32.000000000 +0800
|
|
@@ -636,11 +636,11 @@
|
|
}
|
|
|
|
pub trait USecExt {
|
|
- fn to_bytes(self, spec: &SampleSpec) -> usize;
|
|
+ fn use_to_bytes(self, spec: &SampleSpec) -> usize;
|
|
}
|
|
|
|
impl USecExt for USec {
|
|
- fn to_bytes(self, spec: &SampleSpec) -> usize {
|
|
+ fn use_to_bytes(self, spec: &SampleSpec) -> usize {
|
|
unsafe { ffi::pa_usec_to_bytes(self, spec) }
|
|
}
|
|
}
|
|
diff -ur firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs
|
|
--- firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs 2018-10-02 02:35:24.000000000 +0800
|
|
+++ firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs 2020-05-22 12:49:15.000000000 +0800
|
|
@@ -438,7 +438,7 @@
|
|
let stm = self.output_stream.as_ref().unwrap();
|
|
let r = match stm.get_time() {
|
|
Ok(r_usec) => {
|
|
- let bytes = r_usec.to_bytes(&self.output_sample_spec);
|
|
+ let bytes = r_usec.use_to_bytes(&self.output_sample_spec);
|
|
Ok((bytes / self.output_sample_spec.frame_size()) as u64)
|
|
}
|
|
Err(_) => Err(Error::error()),
|
|
diff -ur firefox-62.0.3/xpcom/base/Logging.h firefox-62.0.3-20200525/xpcom/base/Logging.h
|
|
--- firefox-62.0.3/xpcom/base/Logging.h 2018-10-02 02:35:35.000000000 +0800
|
|
+++ firefox-62.0.3-20200525/xpcom/base/Logging.h 2020-05-22 16:51:42.480111146 +0800
|
|
@@ -247,6 +247,11 @@
|
|
// MOZ_LOG even when logging is disabled to ensure the compiler sees that
|
|
// variables only used during logging code are actually used, even if the
|
|
// code will never be executed.) Hence, the following code.
|
|
+#if defined(__GNUC__)
|
|
+# pragma GCC diagnostic push
|
|
+# pragma GCC diagnostic ignored "-Wformat-security"
|
|
+#endif
|
|
+
|
|
#if MOZ_LOGGING_ENABLED
|
|
#define MOZ_LOG(_module,_level,_args) \
|
|
do { \
|