Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
commit
eadf33f100
|
|
@ -339,22 +339,20 @@ void LLWebRTCImpl::init()
|
|||
nullptr /* video_decoder_factory */,
|
||||
nullptr /* audio_mixer */,
|
||||
mAudioProcessingModule);
|
||||
// <FS:minerjr> [FIRE-36022] - Removing my USB headset crashes entire viewer
|
||||
// It seems that this code is also called by one of the other callback functions
|
||||
// and ends up creating a 2nd observer,which when there was a hardware change,
|
||||
// would cause multiple messages to be dumped to the queue at the same time and
|
||||
// cause a possible race condition/spin lock issue.
|
||||
/* mWorkerThread->PostTask(
|
||||
mWorkerThread->PostTask(
|
||||
[this]()
|
||||
{
|
||||
if (mDeviceModule)
|
||||
{
|
||||
mDeviceModule->EnableBuiltInAEC(false);
|
||||
updateDevices();
|
||||
// <FS:minerjr> [FIRE-36022] - Removing my USB headset crashes entire viewer
|
||||
// It seems that this code is also called by one of the other callback functions
|
||||
// and ends up creating a 2nd observer,which when there was a hardware change,
|
||||
// would cause multiple messages to be dumped to the queue at the same time and
|
||||
// cause a possible race condition/spin lock issue.
|
||||
//updateDevices();
|
||||
}
|
||||
});
|
||||
*/
|
||||
// </FS:minerjr> [FIRE-36022]
|
||||
}
|
||||
|
||||
void LLWebRTCImpl::terminate()
|
||||
|
|
|
|||
Loading…
Reference in New Issue