Merge branch streamlabs into obs_merge_31.1.2

Author: aleksandr-voitenko

libobs/media-io/audio-io.h

@@ -29,7 +29,13 @@ extern "C" {
 #define MAX_AUDIO_MIXES 6
 #define MAX_AUDIO_CHANNELS 8
 #define MAX_DEVICE_INPUT_CHANNELS 64
+#ifdef __APPLE__
+// Increase audio buffer to eliminate error: Source X is lagging (over by X ms) at max audio buffering. Restarting source audio.
+// Users have submitted logs where their audio restarts. Increasing buffer size resolved the issue locally
+#define AUDIO_OUTPUT_FRAMES 4096
+#else
 #define AUDIO_OUTPUT_FRAMES 1024
+#endif
 
 #define TOTAL_AUDIO_SIZE (MAX_AUDIO_MIXES * MAX_AUDIO_CHANNELS * AUDIO_OUTPUT_FRAMES * sizeof(float))
 

plugins/mac-capture/mac-audio.c

@@ -484,21 +484,12 @@ static void coreaudio_begin_reconnect(struct coreaudio_data *ca)
 	// It is better to set the 'reconnecting' status here to avoid desynchronization.
 	// If the thread creation fails, something is broken anyway.
 	ca->reconnecting = true;
-
-	pthread_attr_t attr;
-	pthread_attr_init(&attr);
-
-	// Set QoS class for high-priority real-time work
-	// USER_INTERACTIVE is the highest reasonable QoS for audio
-	pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INTERACTIVE, 0);
-	ret = pthread_create(&ca->reconnect_thread, &attr, reconnect_thread,
-			     ca);
+	ret = pthread_create(&ca->reconnect_thread, NULL, reconnect_thread, ca);
 	if (ret != 0)
 		blog(LOG_WARNING,
 		     "[coreaudio_begin_reconnect] failed to "
 		     "create thread, error code: %d",
 		     ret);
-	pthread_attr_destroy(&attr);
 }
 
 static OSStatus notification_callback(AudioObjectID id, UInt32 num_addresses,