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

node: add option to pause-on-idle

Browse source 
v4l2 is slower to start when we pause in idle. Disable this
behaviour with an option on the node.
This commit is contained in:
Wim Taymans 2018-02-20 12:28:19 +01:00
parent 920d098ea7
commit 2fe7197930
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/plugins/v4l2/v4l2-source.c
View file

@ -861,6 +861,7 @@ static int impl_node_process_output(struct spa_node *node)
static const struct spa_dict_item info_items[] = { static const struct spa_dict_item info_items[] = {
{ "media.class", "Video/Source" }, { "media.class", "Video/Source" },
{ "node.pause-on-idle", "false" },
}; };
static const struct spa_dict info = { static const struct spa_dict info = {

26
src/pipewire/node.c
View file

@ -40,6 +40,7 @@ struct impl {
struct pw_node this; struct pw_node this;
struct pw_work_queue *work; struct pw_work_queue *work;
bool pause_on_idle;
}; };
struct resource_data { struct resource_data {
@ -372,6 +373,17 @@ int pw_node_register(struct pw_node *this,
return 0; return 0;
} }
static void check_properties(struct pw_node *node)
{
struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
const char *str;
if ((str = pw_properties_get(node->properties, "node.pause-on-idle")))
impl->pause_on_idle = pw_properties_parse_bool(str);
else
impl->pause_on_idle = true;
}
struct pw_node *pw_node_new(struct pw_core *core, struct pw_node *pw_node_new(struct pw_core *core,
const char *name, const char *name,
struct pw_properties *properties, struct pw_properties *properties,
@ -399,6 +411,8 @@ struct pw_node *pw_node_new(struct pw_core *core,
this->enabled = true; this->enabled = true;
this->properties = properties; this->properties = properties;
check_properties(this);
impl->work = pw_work_queue_new(this->core->main_loop); impl->work = pw_work_queue_new(this->core->main_loop);
this->info.name = strdup(name); this->info.name = strdup(name);
@ -460,6 +474,8 @@ int pw_node_update_properties(struct pw_node *node, const struct spa_dict *dict)
for (i = 0; i < dict->n_items; i++) for (i = 0; i < dict->n_items; i++)
pw_properties_set(node->properties, dict->items[i].key, dict->items[i].value); pw_properties_set(node->properties, dict->items[i].key, dict->items[i].value);
check_properties(node);
node->info.props = &node->properties->dict; node->info.props = &node->properties->dict;
node->info.change_mask |= PW_NODE_CHANGE_MASK_PROPS; node->info.change_mask |= PW_NODE_CHANGE_MASK_PROPS;
@ -885,6 +901,7 @@ int pw_node_set_state(struct pw_node *node, enum pw_node_state state)
*/ */
void pw_node_update_state(struct pw_node *node, enum pw_node_state state, char *error) void pw_node_update_state(struct pw_node *node, enum pw_node_state state, char *error)
{ {
struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
enum pw_node_state old; enum pw_node_state old;
old = node->info.state; old = node->info.state;
@ -894,14 +911,17 @@ void pw_node_update_state(struct pw_node *node, enum pw_node_state state, char *
pw_log_debug("node %p: update state from %s -> %s", node, pw_log_debug("node %p: update state from %s -> %s", node,
pw_node_state_as_string(old), pw_node_state_as_string(state)); pw_node_state_as_string(old), pw_node_state_as_string(state));
if (state == PW_NODE_STATE_IDLE) {
if (impl->pause_on_idle)
pause_node(node);
node_deactivate(node);
}
if (node->info.error) if (node->info.error)
free((char*)node->info.error); free((char*)node->info.error);
node->info.error = error; node->info.error = error;
node->info.state = state; node->info.state = state;
if (state == PW_NODE_STATE_IDLE)
node_deactivate(node);
spa_hook_list_call(&node->listener_list, struct pw_node_events, state_changed, spa_hook_list_call(&node->listener_list, struct pw_node_events, state_changed,
old, state, error); old, state, error);