mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-10 13:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: also allow 44.1KHz as samplerate

Browse source 
Make the default allowed samplerates be 44.1KHz and 48KHz to see
what happens..
This commit is contained in:
Wim Taymans 2022-04-28 17:02:27 +02:00
parent b7845bd702
commit da072d6613
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/minimal.conf.in
View file

@ -27,7 +27,7 @@ context.properties = {
## Properties for the DSP configuration. ## Properties for the DSP configuration.
#default.clock.rate = 48000 #default.clock.rate = 48000
#default.clock.allowed-rates = [ 48000 ] #default.clock.allowed-rates = [ 44100 48000 ]
#default.clock.quantum = 1024 #default.clock.quantum = 1024
#default.clock.min-quantum = 32 #default.clock.min-quantum = 32
#default.clock.max-quantum = 2048 #default.clock.max-quantum = 2048

2
src/daemon/pipewire.conf.in
View file

@ -27,7 +27,7 @@ context.properties = {
## Properties for the DSP configuration. ## Properties for the DSP configuration.
#default.clock.rate = 48000 #default.clock.rate = 48000
#default.clock.allowed-rates = [ 48000 ] #default.clock.allowed-rates = [ 44100 48000 ]
#default.clock.quantum = 1024 #default.clock.quantum = 1024
default.clock.min-quantum = 16 default.clock.min-quantum = 16
#default.clock.max-quantum = 2048 #default.clock.max-quantum = 2048

10
src/pipewire/settings.c
View file

@ -41,6 +41,7 @@
#define NAME "settings" #define NAME "settings"
#define DEFAULT_CLOCK_RATE 48000u #define DEFAULT_CLOCK_RATE 48000u
#define DEFAULT_CLOCK_RATES "[ 44100 48000 ]"
#define DEFAULT_CLOCK_QUANTUM 1024u #define DEFAULT_CLOCK_QUANTUM 1024u
#define DEFAULT_CLOCK_MIN_QUANTUM 32u #define DEFAULT_CLOCK_MIN_QUANTUM 32u
#define DEFAULT_CLOCK_MAX_QUANTUM 2048u #define DEFAULT_CLOCK_MAX_QUANTUM 2048u
@ -126,15 +127,17 @@ static uint32_t parse_uint32_array(const char *str, uint32_t *vals, uint32_t max
} }
static uint32_t parse_clock_rate(struct pw_properties *properties, const char *name, static uint32_t parse_clock_rate(struct pw_properties *properties, const char *name,
uint32_t *rates, uint32_t def) uint32_t *rates, const char *def_rates, uint32_t def)
{ {
const char *str; const char *str;
uint32_t count = 0; uint32_t count = 0;
if ((str = pw_properties_get(properties, name)) == NULL) if ((str = pw_properties_get(properties, name)) == NULL)
return 0; str = def_rates;
count = parse_uint32_array(str, rates, MAX_RATES, def); count = parse_uint32_array(str, rates, MAX_RATES, def);
if (count == 0)
count = parse_uint32_array(def_rates, rates, MAX_RATES, def);
if (count == 0) if (count == 0)
goto fallback; goto fallback;
@ -223,7 +226,8 @@ void pw_settings_init(struct pw_context *this)
struct settings *d = &this->defaults; struct settings *d = &this->defaults;
d->clock_rate = get_default_int(p, "default.clock.rate", DEFAULT_CLOCK_RATE); d->clock_rate = get_default_int(p, "default.clock.rate", DEFAULT_CLOCK_RATE);
d->n_clock_rates = parse_clock_rate(p, "default.clock.allowed-rates", d->clock_rates, d->clock_rate); d->n_clock_rates = parse_clock_rate(p, "default.clock.allowed-rates", d->clock_rates,
DEFAULT_CLOCK_RATES, d->clock_rate);
d->clock_quantum = get_default_int(p, "default.clock.quantum", DEFAULT_CLOCK_QUANTUM); d->clock_quantum = get_default_int(p, "default.clock.quantum", DEFAULT_CLOCK_QUANTUM);
d->clock_min_quantum = get_default_int(p, "default.clock.min-quantum", DEFAULT_CLOCK_MIN_QUANTUM); d->clock_min_quantum = get_default_int(p, "default.clock.min-quantum", DEFAULT_CLOCK_MIN_QUANTUM);
d->clock_max_quantum = get_default_int(p, "default.clock.max-quantum", DEFAULT_CLOCK_MAX_QUANTUM); d->clock_max_quantum = get_default_int(p, "default.clock.max-quantum", DEFAULT_CLOCK_MAX_QUANTUM);