Always clear thread local context.

desktop-app · Mar 18, 2021 · 01258d9 · 01258d9
1 parent daa067c
commit 01258d9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/webrtc/details/webrtc_openal_adm.cpp b/webrtc/details/webrtc_openal_adm.cpp
@@ -867,10 +867,16 @@ void AudioDeviceOpenAL::startPlayingOnThread() {
 void AudioDeviceOpenAL::stopPlayingOnThread() {
 	Expects(_data != nullptr);
 
-	if (!_data->playing) {
-		return;
-	}
 	sync([&] {
+		const auto guard = gsl::finally([&] {
+			if (alEventCallbackSOFT) {
+				alEventCallbackSOFT(nullptr, nullptr);
+			}
+			alcSetThreadContext(nullptr);
+		});
+		if (!_data->playing) {
+			return;
+		}
 		_data->playing = false;
 		if (_playoutFailed) {
 			return;
@@ -886,7 +892,6 @@ void AudioDeviceOpenAL::stopPlayingOnThread() {
 			_data->source = 0;
 			ranges::fill(_data->buffers, ALuint(0));
 		}
-		alcSetThreadContext(nullptr);
 	});
 }
 

diff --git a/webrtc/details/webrtc_openal_adm.h b/webrtc/details/webrtc_openal_adm.h
@@ -126,7 +126,11 @@ class AudioDeviceOpenAL : public webrtc::AudioDeviceModule {
 	void openRecordingDevice();
 	void openPlayoutDevice();
 	void closeRecordingDevice();
+
+	// NB! stopPlayingOnThread should be called before this,
+	// to clear the thread local context and event callback.
 	void closePlayoutDevice();
+
 	int restartPlayout();
 	int restartRecording();
 	void restartRecordingQueued();
@@ -138,6 +142,9 @@ class AudioDeviceOpenAL : public webrtc::AudioDeviceModule {
 	void startCaptureOnThread();
 	void stopCaptureOnThread();
 	void startPlayingOnThread();
+
+	// NB! closePlayoutDevice should be called after this, so that next time
+	// we start playing, we set the thread local context and event callback.
 	void stopPlayingOnThread();
 
 	void processData();