encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: pipewire: Use client config files instead of module names 

Pipewire, as of 0.3.22, uses client config files to load modules instead of explicitly specifying them (PW_KEY_CONTEXT_PROFILE_MODULES is deprecated).  Use the new method to load the realtime module to boost the audio thread priority.
This commit is contained in:
Frank Praznik 2022-01-19 13:14:54 -05:00 committed by Ethan Lee
parent 381520ad92
commit b3984df1c6
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/audio/pipewire/SDL_pipewire.c
View File

@ -31,8 +31,22 @@
#include <pipewire/extensions/metadata.h> #include <pipewire/extensions/metadata.h>
#include <spa/param/audio/format-utils.h> #include <spa/param/audio/format-utils.h>
/* Older versions of Pipewire may not define this, but it's safe to pass at /*
* runtime even if older installations don't recognize it. * The following keys are defined for compatability when building against older versions of Pipewire
* prior to their introduction and can be removed if the minimum required Pipewire version is increased
* to or beyond their point of introduction.
*/
/*
* Introduced in 0.3.22
* Taken from /src/pipewire/keys.h
*/
#ifndef PW_KEY_CONFIG_NAME
#define PW_KEY_CONFIG_NAME "config.name"
#endif
/*
* Introduced in 0.3.33
* Taken from src/pipewire/keys.h * Taken from src/pipewire/keys.h
*/ */
#ifndef PW_KEY_NODE_RATE #ifndef PW_KEY_NODE_RATE
@ -1099,8 +1113,17 @@ PIPEWIRE_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
return SDL_SetError("Pipewire: Failed to create stream loop (%i)", errno); return SDL_SetError("Pipewire: Failed to create stream loop (%i)", errno);
} }
/* Load the rtkit module so Pipewire can set the loop thread to the appropriate priority */ /*
props = PIPEWIRE_pw_properties_new(PW_KEY_CONTEXT_PROFILE_MODULES, "default,rtkit", NULL); * Load the realtime module so Pipewire can set the loop thread to the appropriate priority.
*
* NOTE: Pipewire versions 0.3.22 or higher require the PW_KEY_CONFIG_NAME property (with client-rt.conf),
* lower versions require explicitly specifying the 'rtkit' module.
*
* PW_KEY_CONTEXT_PROFILE_MODULES is deprecated and can be safely removed if the minimum required
* Pipewire version is increased to 0.3.22 or higher at some point.
*/
props = PIPEWIRE_pw_properties_new(PW_KEY_CONFIG_NAME, "client-rt.conf",
PW_KEY_CONTEXT_PROFILE_MODULES, "default,rtkit", NULL);
if (props == NULL) { if (props == NULL) {
return SDL_SetError("Pipewire: Failed to create stream context properties (%i)", errno); return SDL_SetError("Pipewire: Failed to create stream context properties (%i)", errno);
} }