aboutsummaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug1664115
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox/files/patch-bug1664115')
-rw-r--r--www/firefox/files/patch-bug166411534
1 files changed, 15 insertions, 19 deletions
diff --git a/www/firefox/files/patch-bug1664115 b/www/firefox/files/patch-bug1664115
index 6672aa67459d..05bc6a15e35f 100644
--- a/www/firefox/files/patch-bug1664115
+++ b/www/firefox/files/patch-bug1664115
@@ -3,11 +3,9 @@ using any cubeb backends other than pulse-rust to play media. The loss of
such change will be that users will not be able to do profiling on threads
created by libcubeb.
-diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp
-index 1b62a26ab32b2..35c61f612bf72 100644
---- dom/media/AudioStream.cpp
-+++ dom/media/AudioStream.cpp
-@@ -25,7 +25,6 @@
+--- dom/media/AudioStream.cpp.orig 2021-03-20 22:57:21.194862000 +0100
++++ dom/media/AudioStream.cpp 2021-03-20 23:00:50.527112000 +0100
+@@ -26,7 +26,6 @@
#endif
#include "Tracing.h"
#include "webaudio/blink/DenormalDisabler.h"
@@ -15,18 +13,18 @@ index 1b62a26ab32b2..35c61f612bf72 100644
// Use abort() instead of exception in SoundTouch.
#define ST_NO_EXCEPTION_HANDLING 1
-@@ -138,9 +137,7 @@
+@@ -139,9 +138,7 @@
mTimeStretcher(nullptr),
mState(INITIALIZED),
mDataSource(aSource),
- mPrefillQuirk(false),
- mAudioThreadId(0),
-- mSandboxed(CubebUtils::SandboxEnabled()) {
-+ mPrefillQuirk(false) {
- #if defined(XP_WIN)
- if (XRE_IsContentProcess()) {
- audio::AudioNotificationReceiver::Register(this);
-@@ -587,21 +584,7 @@
+- mSandboxed(CubebUtils::SandboxEnabled()) {}
++ mPrefillQuirk(false) {}
+
+ AudioStream::~AudioStream() {
+ LOG("deleted, state %d", mState);
+@@ -565,21 +562,7 @@
aWriter.Available());
}
@@ -48,7 +46,7 @@ index 1b62a26ab32b2..35c61f612bf72 100644
WebCore::DenormalDisabler disabler;
TRACE_AUDIO_CALLBACK_BUDGET(aFrames, mAudioClock.GetInputRate());
-@@ -657,9 +640,6 @@
+@@ -635,9 +618,6 @@
mDumpFile.Write(static_cast<const AudioDataValue*>(aBuffer),
aFrames * mOutChannels);
@@ -58,11 +56,9 @@ index 1b62a26ab32b2..35c61f612bf72 100644
return aFrames - writer.Available();
}
-diff --git dom/media/AudioStream.h dom/media/AudioStream.h
-index 933e4cb3bfdb5..5d2181e632af9 100644
---- dom/media/AudioStream.h
-+++ dom/media/AudioStream.h
-@@ -307,7 +307,6 @@ class AudioStream final
+--- dom/media/AudioStream.h.orig 2021-03-20 23:01:10.169773000 +0100
++++ dom/media/AudioStream.h 2021-03-20 23:01:56.622691000 +0100
+@@ -294,7 +294,6 @@
template <typename Function, typename... Args>
int InvokeCubeb(Function aFunction, Args&&... aArgs);
@@ -70,7 +66,7 @@ index 933e4cb3bfdb5..5d2181e632af9 100644
// The monitor is held to protect all access to member variables.
Monitor mMonitor;
-@@ -341,9 +340,6 @@ class AudioStream final
+@@ -328,9 +327,6 @@
// the default device is used. It is set
// during the Init() in decoder thread.
RefPtr<AudioDeviceInfo> mSinkInfo;