attempt to fix opus crash

altmp · Sep 18, 2023 · 55101ef · 55101ef
1 parent f786093
commit 55101ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/CSoundInput.cpp b/src/CSoundInput.cpp
@@ -15,6 +15,7 @@ CSoundInput::CSoundInput(int _bitRate) : encoder(new COpusEncoder(SAMPLE_RATE, A
 
 CSoundInput::~CSoundInput()
 {
+	std::unique_lock lock{ inputMutex };
 	delete encoder;
 	delete opusBuffer;
 	rnnoise_destroy(denoiser);
@@ -203,6 +204,7 @@ void CSoundInput::SetNoiseSuppressionEnabled(const bool enabled)
 BOOL CSoundInput::OnSoundFrame(HRECORD handle, const void* buffer, DWORD length, void* user)
 {
 	const auto self = static_cast<CSoundInput*>(user);
+	std::unique_lock lock{ self->inputMutex };
 
 	for (int i = 0; i < length; i += (FRAME_SIZE_SAMPLES * sizeof(short)))
 	{

diff --git a/src/CSoundInput.h b/src/CSoundInput.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <bass.h>
 #include <rnnoise.h>
+#include <mutex>
 
 #include "alt-voice.h"
 #include "ISoundInput.h"
@@ -36,6 +37,8 @@ class CSoundInput : public ISoundInput
 	bool recording = false;
 	bool deviceLost = false;
 	bool isDefault = true;
+
+	std::mutex inputMutex;
 public:
 	CSoundInput(int _bitRate);
 	~CSoundInput() override;