tor-browser

commit 7d2f37838ed207ede8b4957937f70e966e8f24f3
parent 7b5b612e0ffeafd8548c5137e2c68ac182cd471b
Author: Andreas Pehrson <apehrson@mozilla.com>
Date:   Tue, 14 Oct 2025 18:35:43 +0000

Bug 1771789 - Pass CubebInputStream the same CubebHandle used to enumerate its device id. r=padenot

Differential Revision: https://phabricator.services.mozilla.com/D266400

Diffstat:
M
dom/media/CubebInputStream.cpp
 | 
9
++++-----
M
dom/media/CubebInputStream.h
 | 
1
+

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dom/media/CubebInputStream.cpp b/dom/media/CubebInputStream.cpp
@@ -112,18 +112,17 @@ UniquePtr<CubebInputStream> CubebInputStream::Create(cubeb_devid aDeviceId,
 
   LOG("Create a cubeb stream %p successfully", inputStream.get());
 
-  UniquePtr<CubebInputStream> stream(
-      new CubebInputStream(listener.forget(), std::move(inputStream)));
+  UniquePtr<CubebInputStream> stream(new CubebInputStream(
+      listener.forget(), handle.forget(), std::move(inputStream)));
   stream->Init();
   return stream;
 }
 
 CubebInputStream::CubebInputStream(
     already_AddRefed<Listener>&& aListener,
+    already_AddRefed<CubebUtils::CubebHandle>&& aCubeb,
     UniquePtr<cubeb_stream, CubebDestroyPolicy>&& aStream)
-    : mListener(aListener),
-      mCubeb(CubebUtils::GetCubeb()),
-      mStream(std::move(aStream)) {
+    : mListener(aListener), mCubeb(aCubeb), mStream(std::move(aStream)) {
   MOZ_ASSERT(mListener);
   MOZ_ASSERT(mStream);
 }
diff --git a/dom/media/CubebInputStream.h b/dom/media/CubebInputStream.h
@@ -62,6 +62,7 @@ class CubebInputStream final {
     void operator()(cubeb_stream* aStream) const;
   };
   CubebInputStream(already_AddRefed<Listener>&& aListener,
+                   already_AddRefed<CubebUtils::CubebHandle>&& aCubeb,
                    UniquePtr<cubeb_stream, CubebDestroyPolicy>&& aStream);
 
   void Init();