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

pulse-server: add a pulse.idle.timeout option

Browse source 
When a client is not sending any data when it should be and causes an
underrun, mark it as idle and record the timestamp.

When a client is idle for pulse.idle.timeout seconds, set the stream
as inactive. When more data is received, set it back to active.

Add a pulse.idle.timeout option to set a global server default or
a per-stream value. Set the server default to 5 seconds. A value of 0
can be used to disable this feature.

With this change, badly behaving clients that are not sending any data
will be paused so that the sinks can suspend to save battery power.

Fixes #2839
This commit is contained in:
Wim Taymans 2022-11-20 16:13:22 +01:00
parent b1c0662a00
commit a0adb52124
6 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -85,6 +85,7 @@
#define DEFAULT_MIN_QUANTUM "256/48000"
#define DEFAULT_FORMAT "F32"
#define DEFAULT_POSITION "[ FL FR ]"
#define DEFAULT_IDLE_TIMEOUT "5"
#define MAX_FORMATS 32
/* The max amount of data we send in one block when capturing. In PulseAudio this
@ -1276,6 +1277,7 @@ struct process_data {
uint32_t minreq;
uint32_t quantum;
unsigned int underrun:1;
unsigned int idle:1;
};
static int
@ -1315,6 +1317,17 @@ do_process_done(struct spa_loop *loop,
else
stream_send_started(stream);
}
if (pd->idle) {
if (!stream->is_idle) {
stream->idle_time = stream->timestamp;
} else if (!stream->is_paused &&
stream->idle_timeout_sec > 0 &&
stream->timestamp - stream->idle_time >
(stream->idle_timeout_sec * SPA_NSEC_PER_SEC)) {
stream_set_paused(stream, true, "long underrun");
}
}
stream->is_idle = pd->idle;
stream->playing_for += pd->playing_for;
if (stream->underrun_for != (uint64_t)-1)
stream->underrun_for += pd->underrun_for;
@ -1440,6 +1453,7 @@ static void stream_process(void *data)
pd.playing_for = size;
}
pd.idle = true;
pw_log_debug("%p: [%s] underrun read:%u avail:%d max:%u",
stream, client->name, index, avail, minreq);
} else {
@ -5548,6 +5562,20 @@ static int parse_format(struct pw_properties *props, const char *key, const char
pw_log_info(": defaults: %s = %s", key, format_id2name(res->format));
return 0;
}
static int parse_uint32(struct pw_properties *props, const char *key, const char *def,
uint32_t *res)
{
const char *str;
if (props == NULL ||
(str = pw_properties_get(props, key)) == NULL)
str = def;
if (!spa_atou32(str, res, 0)) {
pw_log_warn(": invalid uint32_t %s, default to %s", str, def);
spa_atou32(def, res, 0);
}
pw_log_info(": defaults: %s = %u", key, *res);
return 0;
}
static void load_defaults(struct defs *def, struct pw_properties *props)
{
@ -5559,6 +5587,7 @@ static void load_defaults(struct defs *def, struct pw_properties *props)
parse_frac(props, "pulse.min.quantum", DEFAULT_MIN_QUANTUM, &def->min_quantum);
parse_format(props, "pulse.default.format", DEFAULT_FORMAT, &def->sample_spec);
parse_position(props, "pulse.default.position", DEFAULT_POSITION, &def->channel_map);
parse_uint32(props, "pulse.idle.timeout", DEFAULT_IDLE_TIMEOUT, &def->idle_timeout);
def->sample_spec.channels = def->channel_map.channels;
def->quantum_limit = 8192;
}