videoconvert: apply changes from audioadapter

Update the videoadapter to the structure of the audioadapter.
This commit is contained in:
columbarius 2023-09-24 01:26:25 +02:00 committed by Wim Taymans
parent 846f994ac8
commit d6c1b6470a

View file

@ -20,6 +20,7 @@
#include <spa/param/param.h> #include <spa/param/param.h>
#include <spa/param/video/format-utils.h> #include <spa/param/video/format-utils.h>
#include <spa/param/latency-utils.h> #include <spa/param/latency-utils.h>
#include <spa/param/tag-utils.h>
#include <spa/debug/format.h> #include <spa/debug/format.h>
#include <spa/debug/pod.h> #include <spa/debug/pod.h>
#include <spa/debug/log.h> #include <spa/debug/log.h>
@ -30,7 +31,7 @@ SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.videoadapter");
#define DEFAULT_ALIGN 16 #define DEFAULT_ALIGN 16
#define MAX_PORTS 1 #define MAX_PORTS (1+1)
/** \cond */ /** \cond */
@ -48,14 +49,15 @@ struct impl {
struct spa_node *follower; struct spa_node *follower;
struct spa_hook follower_listener; struct spa_hook follower_listener;
uint32_t follower_flags; uint64_t follower_flags;
struct spa_video_info follower_current_format; struct spa_video_info follower_current_format;
struct spa_video_info default_format; struct spa_video_info default_format;
int in_set_param;
struct spa_handle *hnd_convert; struct spa_handle *hnd_convert;
struct spa_node *convert; struct spa_node *convert;
struct spa_hook convert_listener; struct spa_hook convert_listener;
uint32_t convert_flags; uint64_t convert_flags;
uint32_t n_buffers; uint32_t n_buffers;
struct spa_buffer **buffers; struct spa_buffer **buffers;
@ -74,10 +76,12 @@ struct impl {
#define IDX_PortConfig 5 #define IDX_PortConfig 5
#define IDX_Latency 6 #define IDX_Latency 6
#define IDX_ProcessLatency 7 #define IDX_ProcessLatency 7
#define N_NODE_PARAMS 8 #define IDX_Tag 8
#define N_NODE_PARAMS 9
struct spa_param_info params[N_NODE_PARAMS]; struct spa_param_info params[N_NODE_PARAMS];
uint32_t convert_params_flags[N_NODE_PARAMS]; uint32_t convert_params_flags[N_NODE_PARAMS];
uint32_t follower_params_flags[N_NODE_PARAMS]; uint32_t follower_params_flags[N_NODE_PARAMS];
uint64_t follower_port_flags;
struct spa_hook_list hooks; struct spa_hook_list hooks;
struct spa_callbacks callbacks; struct spa_callbacks callbacks;
@ -85,10 +89,14 @@ struct impl {
unsigned int add_listener:1; unsigned int add_listener:1;
unsigned int have_format:1; unsigned int have_format:1;
unsigned int started:1; unsigned int started:1;
unsigned int driver:1; unsigned int ready:1;
unsigned int async:1; unsigned int async:1;
unsigned int passthrough:1; unsigned int passthrough:1;
unsigned int follower_removing:1; unsigned int follower_removing:1;
unsigned int in_recalc;
unsigned int warned:1;
unsigned int driver:1;
}; };
/** \endcond */ /** \endcond */
@ -120,13 +128,35 @@ static int follower_enum_params(struct impl *this,
return 0; return 0;
} }
static int convert_enum_port_config(struct impl *this,
int seq, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter, struct spa_pod_builder *builder)
{
struct spa_pod *f1, *f2 = NULL;
int res;
f1 = spa_pod_builder_add_object(builder,
SPA_TYPE_OBJECT_ParamPortConfig, id,
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction));
if (filter) {
if ((res = spa_pod_filter(builder, &f2, f1, filter)) < 0)
return res;
}
else {
f2 = f1;
}
return spa_node_enum_params(this->convert, seq, id, start, num, f2);
}
static int impl_node_enum_params(void *object, int seq, static int impl_node_enum_params(void *object, int seq,
uint32_t id, uint32_t start, uint32_t num, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter) const struct spa_pod *filter)
{ {
struct impl *this = object; struct impl *this = object;
uint8_t buffer[4096]; uint8_t buffer[4096];
struct spa_pod_dynamic_builder b; spa_auto(spa_pod_dynamic_builder) b = { 0 };
struct spa_pod_builder_state state;
struct spa_result_node_params result; struct spa_result_node_params result;
uint32_t count = 0; uint32_t count = 0;
int res; int res;
@ -134,6 +164,9 @@ static int impl_node_enum_params(void *object, int seq,
spa_return_val_if_fail(this != NULL, -EINVAL); spa_return_val_if_fail(this != NULL, -EINVAL);
spa_return_val_if_fail(num != 0, -EINVAL); spa_return_val_if_fail(num != 0, -EINVAL);
spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
spa_pod_builder_get_state(&b.b, &state);
result.id = id; result.id = id;
result.next = start; result.next = start;
next: next:
@ -141,15 +174,34 @@ next:
spa_log_debug(this->log, "%p: %d id:%u", this, seq, id); spa_log_debug(this->log, "%p: %d id:%u", this, seq, id);
spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096); spa_pod_builder_reset(&b.b, &state);
switch (id) { switch (id) {
case SPA_PARAM_EnumPortConfig: case SPA_PARAM_EnumPortConfig:
case SPA_PARAM_PortConfig:
if (this->convert == NULL) if (this->convert == NULL)
return 0; return 0;
res = spa_node_enum_params(this->convert, seq, id, start, num, filter); return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
return res; case SPA_PARAM_PortConfig:
if (this->passthrough) {
switch (result.index) {
case 0:
result.param = spa_pod_builder_add_object(&b.b,
SPA_TYPE_OBJECT_ParamPortConfig, id,
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction),
SPA_PARAM_PORT_CONFIG_mode, SPA_POD_Id(
SPA_PARAM_PORT_CONFIG_MODE_passthrough));
result.next++;
res = 1;
break;
default:
return 0;
}
} else {
if (this->convert == NULL)
return 0;
return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
}
break;
case SPA_PARAM_PropInfo: case SPA_PARAM_PropInfo:
res = follower_enum_params(this, res = follower_enum_params(this,
id, IDX_PropInfo, &result, filter, &b.b); id, IDX_PropInfo, &result, filter, &b.b);
@ -165,6 +217,7 @@ next:
case SPA_PARAM_EnumFormat: case SPA_PARAM_EnumFormat:
case SPA_PARAM_Format: case SPA_PARAM_Format:
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
case SPA_PARAM_Tag:
res = spa_node_port_enum_params_sync(this->follower, res = spa_node_port_enum_params_sync(this->follower,
this->direction, 0, this->direction, 0,
id, &result.next, filter, &result.param, &b.b); id, &result.next, filter, &result.param, &b.b);
@ -172,16 +225,12 @@ next:
default: default:
return -ENOENT; return -ENOENT;
} }
if (res == 1) {
spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
count++;
}
spa_pod_dynamic_builder_clean(&b);
if (res != 1) if (res != 1)
return res; return res;
spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
count++;
if (count != num) if (count != num)
goto next; goto next;
@ -191,6 +240,8 @@ next:
static int link_io(struct impl *this) static int link_io(struct impl *this)
{ {
int res; int res;
struct spa_io_rate_match *rate_match;
size_t rate_match_size;
if (this->convert == NULL) if (this->convert == NULL)
return 0; return 0;
@ -200,21 +251,32 @@ static int link_io(struct impl *this)
spa_zero(this->io_rate_match); spa_zero(this->io_rate_match);
this->io_rate_match.rate = 1.0; this->io_rate_match.rate = 1.0;
if (this->follower == this->target) {
rate_match = NULL;
rate_match_size = 0;
} else {
rate_match = &this->io_rate_match;
rate_match_size = sizeof(this->io_rate_match);
}
if ((res = spa_node_port_set_io(this->follower, if ((res = spa_node_port_set_io(this->follower,
this->direction, 0, this->direction, 0,
SPA_IO_RateMatch, SPA_IO_RateMatch,
&this->io_rate_match, sizeof(this->io_rate_match))) < 0) { rate_match, rate_match_size)) < 0) {
spa_log_debug(this->log, "%p: set RateMatch on follower disabled %d %s", this, spa_log_debug(this->log, "%p: set RateMatch on follower disabled %d %s", this,
res, spa_strerror(res)); res, spa_strerror(res));
} }
else if ((res = spa_node_port_set_io(this->convert, else if ((res = spa_node_port_set_io(this->convert,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_IO_RateMatch, SPA_IO_RateMatch,
&this->io_rate_match, sizeof(this->io_rate_match))) < 0) { rate_match, rate_match_size)) < 0) {
spa_log_warn(this->log, "%p: set RateMatch on convert failed %d %s", this, spa_log_warn(this->log, "%p: set RateMatch on convert failed %d %s", this,
res, spa_strerror(res)); res, spa_strerror(res));
} }
if (this->follower == this->target)
return 0;
this->io_buffers = SPA_IO_BUFFERS_INIT; this->io_buffers = SPA_IO_BUFFERS_INIT;
if ((res = spa_node_port_set_io(this->follower, if ((res = spa_node_port_set_io(this->follower,
@ -280,7 +342,7 @@ static int debug_params(struct impl *this, struct spa_node *node,
if (filter) { if (filter) {
spa_log_error(this->log, "with this filter:"); spa_log_error(this->log, "with this filter:");
spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 2, NULL, filter); spa_debug_log_pod(this->log, SPA_LOG_LEVEL_ERROR, 2, NULL, filter);
} else { } else {
spa_log_error(this->log, "there was no filter"); spa_log_error(this->log, "there was no filter");
} }
@ -298,7 +360,7 @@ static int debug_params(struct impl *this, struct spa_node *node,
break; break;
} }
spa_log_error(this->log, "unmatched %s %d:", debug, count); spa_log_error(this->log, "unmatched %s %d:", debug, count);
spa_debug_log_pod(this->log, SPA_LOG_LEVEL_DEBUG, 2, NULL, param); spa_debug_log_pod(this->log, SPA_LOG_LEVEL_ERROR, 2, NULL, param);
count++; count++;
} }
if (count == 0) if (count == 0)
@ -318,12 +380,9 @@ static int negotiate_buffers(struct impl *this)
uint32_t i, size, buffers, blocks, align, flags, stride = 0; uint32_t i, size, buffers, blocks, align, flags, stride = 0;
uint32_t *aligns; uint32_t *aligns;
struct spa_data *datas; struct spa_data *datas;
uint32_t follower_flags, conv_flags; uint64_t follower_flags, conv_flags;
spa_log_debug(this->log, "%p: %d", this, this->n_buffers); spa_log_debug(this->log, "%p: n_buffers:%d", this, this->n_buffers);
if (this->target == this->follower)
return 0;
if (this->n_buffers > 0) if (this->n_buffers > 0)
return 0; return 0;
@ -382,6 +441,9 @@ static int negotiate_buffers(struct impl *this)
SPA_PARAM_BUFFERS_align, SPA_POD_OPT_Int(&align))) < 0) SPA_PARAM_BUFFERS_align, SPA_POD_OPT_Int(&align))) < 0)
return res; return res;
if (this->async)
buffers = SPA_MAX(2u, buffers);
spa_log_debug(this->log, "%p: buffers:%d, blocks:%d, size:%d, stride:%d align:%d %d:%d", spa_log_debug(this->log, "%p: buffers:%d, blocks:%d, size:%d, stride:%d align:%d %d:%d",
this, buffers, blocks, size, stride, align, follower_alloc, conv_alloc); this, buffers, blocks, size, stride, align, follower_alloc, conv_alloc);
@ -420,8 +482,12 @@ static int negotiate_buffers(struct impl *this)
static int configure_format(struct impl *this, uint32_t flags, const struct spa_pod *format) static int configure_format(struct impl *this, uint32_t flags, const struct spa_pod *format)
{ {
uint8_t buffer[4096];
int res; int res;
if (format == NULL && !this->have_format)
return 0;
spa_log_debug(this->log, "%p: configure format:", this); spa_log_debug(this->log, "%p: configure format:", this);
if (format) if (format)
spa_debug_log_format(this->log, SPA_LOG_LEVEL_DEBUG, 0, NULL, format); spa_debug_log_format(this->log, SPA_LOG_LEVEL_DEBUG, 0, NULL, format);
@ -431,14 +497,13 @@ static int configure_format(struct impl *this, uint32_t flags, const struct spa_
SPA_PARAM_Format, flags, SPA_PARAM_Format, flags,
format)) < 0) format)) < 0)
return res; return res;
if (res > 0) { if (res > 0) {
uint8_t buffer[4096]; struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
struct spa_pod_builder b = { 0 };
uint32_t state = 0; uint32_t state = 0;
struct spa_pod *fmt; struct spa_pod *fmt;
/* format was changed to nearest compatible format */ /* format was changed to nearest compatible format */
spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params_sync(this->follower, if ((res = spa_node_port_enum_params_sync(this->follower,
this->direction, 0, this->direction, 0,
@ -449,7 +514,7 @@ static int configure_format(struct impl *this, uint32_t flags, const struct spa_
format = fmt; format = fmt;
} }
if (this->target != this->follower && this->convert) { if (this->convert && this->target != this->follower) {
if ((res = spa_node_port_set_param(this->convert, if ((res = spa_node_port_set_param(this->convert,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_PARAM_Format, flags, SPA_PARAM_Format, flags,
@ -460,10 +525,9 @@ static int configure_format(struct impl *this, uint32_t flags, const struct spa_
this->have_format = format != NULL; this->have_format = format != NULL;
if (format == NULL) { if (format == NULL) {
this->n_buffers = 0; this->n_buffers = 0;
} else { } else if (this->target != this->follower) {
res = negotiate_buffers(this); res = negotiate_buffers(this);
} }
return res; return res;
} }
@ -478,7 +542,7 @@ static int configure_convert(struct impl *this, uint32_t mode)
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
spa_log_debug(this->log, "%p: configure convert %p", this, this->target); spa_log_debug(this->log, "%p: configure convert %p %d", this, this->target, mode);
param = spa_pod_builder_add_object(&b, param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamPortConfig, SPA_PARAM_PortConfig, SPA_TYPE_OBJECT_ParamPortConfig, SPA_PARAM_PortConfig,
@ -492,13 +556,93 @@ extern const struct spa_handle_factory spa_videoconvert_factory;
static const struct spa_node_events follower_node_events; static const struct spa_node_events follower_node_events;
static int recalc_latency(struct impl *this, struct spa_node *src, enum spa_direction direction,
uint32_t port_id, struct spa_node *dst)
{
struct spa_pod_builder b = { 0 };
uint8_t buffer[1024];
struct spa_pod *param;
uint32_t index = 0;
struct spa_latency_info latency;
int res;
spa_log_debug(this->log, "%p: %d:%d", this, direction, port_id);
if (this->target == this->follower)
return 0;
if (dst == NULL)
return 0;
while (true) {
spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params_sync(src,
direction, port_id, SPA_PARAM_Latency,
&index, NULL, &param, &b)) != 1) {
param = NULL;
break;
}
if ((res = spa_latency_parse(param, &latency)) < 0)
return res;
if (latency.direction == direction)
break;
}
if ((res = spa_node_port_set_param(dst,
SPA_DIRECTION_REVERSE(direction), 0,
SPA_PARAM_Latency, 0, param)) < 0)
return res;
return 0;
}
static int recalc_tag(struct impl *this, struct spa_node *src, enum spa_direction direction,
uint32_t port_id, struct spa_node *dst)
{
spa_auto(spa_pod_dynamic_builder) b = { 0 };
struct spa_pod_builder_state state;
uint8_t buffer[2048];
struct spa_pod *param;
uint32_t index = 0;
struct spa_tag_info info;
int res;
spa_log_debug(this->log, "%p: %d:%d", this, direction, port_id);
if (this->target == this->follower)
return 0;
if (dst == NULL)
return 0;
spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 2048);
spa_pod_builder_get_state(&b.b, &state);
while (true) {
void *tag_state = NULL;
spa_pod_builder_reset(&b.b, &state);
if ((res = spa_node_port_enum_params_sync(src,
direction, port_id, SPA_PARAM_Tag,
&index, NULL, &param, &b.b)) != 1) {
param = NULL;
break;
}
if ((res = spa_tag_parse(param, &info, &tag_state)) < 0)
return res;
if (info.direction == direction)
break;
}
return spa_node_port_set_param(dst, SPA_DIRECTION_REVERSE(direction), 0,
SPA_PARAM_Tag, 0, param);
}
static int reconfigure_mode(struct impl *this, bool passthrough, static int reconfigure_mode(struct impl *this, bool passthrough,
enum spa_direction direction, struct spa_pod *format) enum spa_direction direction, struct spa_pod *format)
{ {
int res = 0; int res = 0;
struct spa_hook l; struct spa_hook l;
spa_log_info(this->log, "%p: passthrough mode %d", this, passthrough); spa_log_debug(this->log, "%p: passthrough mode %d", this, passthrough);
if (this->passthrough != passthrough) { if (this->passthrough != passthrough) {
if (passthrough) { if (passthrough) {
@ -530,16 +674,19 @@ static int reconfigure_mode(struct impl *this, bool passthrough,
} else { } else {
/* add converter ports */ /* add converter ports */
configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_dsp); configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_dsp);
link_io(this);
} }
link_io(this);
} }
this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS | SPA_NODE_CHANGE_MASK_PARAMS; this->info.change_mask |= SPA_NODE_CHANGE_MASK_FLAGS | SPA_NODE_CHANGE_MASK_PARAMS;
this->info.flags &= ~SPA_NODE_FLAG_NEED_CONFIGURE; SPA_FLAG_CLEAR(this->info.flags, SPA_NODE_FLAG_NEED_CONFIGURE);
SPA_FLAG_UPDATE(this->info.flags, SPA_NODE_FLAG_ASYNC,
this->async && this->follower == this->target);
this->params[IDX_Props].user++; this->params[IDX_Props].user++;
emit_node_info(this, false); emit_node_info(this, false);
spa_log_debug(this->log, "%p: passthrough mode %d", this, passthrough);
return 0; return 0;
} }
@ -562,9 +709,8 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
if ((res = spa_format_parse(param, &info.media_type, &info.media_subtype)) < 0) if ((res = spa_format_parse(param, &info.media_type, &info.media_subtype)) < 0)
return res; return res;
if (info.media_type != SPA_MEDIA_TYPE_video || if (info.media_type != SPA_MEDIA_TYPE_video ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw) info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
return -EINVAL; return -EINVAL;
if (spa_format_video_raw_parse(param, &info.info.raw) < 0) if (spa_format_video_raw_parse(param, &info.info.raw) < 0)
return -EINVAL; return -EINVAL;
@ -599,8 +745,9 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
info.media_subtype != SPA_MEDIA_SUBTYPE_raw) info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
return -ENOTSUP; return -ENOTSUP;
if (spa_format_video_raw_parse(format, &info.info.raw) >= 0) if (spa_format_video_raw_parse(format, &info.info.raw) >= 0) {
this->default_format = info; this->default_format = info;
}
} }
switch (mode) { switch (mode) {
@ -629,13 +776,16 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
} }
case SPA_PARAM_Props: case SPA_PARAM_Props:
if (this->target != this->follower) {
res = spa_node_set_param(this->target, id, flags, param); int in_set_param = ++this->in_set_param;
res2 = spa_node_set_param(this->follower, id, flags, param); res = spa_node_set_param(this->follower, id, flags, param);
if (this->target != this->follower && this->in_set_param == in_set_param)
res2 = spa_node_set_param(this->target, id, flags, param);
if (res < 0 && res2 < 0) if (res < 0 && res2 < 0)
return res; return res;
res = 0; res = 0;
break; break;
}
case SPA_PARAM_ProcessLatency: case SPA_PARAM_ProcessLatency:
res = spa_node_set_param(this->follower, id, flags, param); res = spa_node_set_param(this->follower, id, flags, param);
break; break;
@ -712,10 +862,12 @@ static int negotiate_format(struct impl *this)
struct spa_pod_builder b = { 0 }; struct spa_pod_builder b = { 0 };
int res; int res;
if (this->have_format) if (this->target == this->follower)
return 0; return 0;
if (this->target == this->follower) spa_log_debug(this->log, "%p: have_format:%d", this, this->have_format);
if (this->have_format)
return 0; return 0;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
@ -739,18 +891,16 @@ static int negotiate_format(struct impl *this)
goto done; goto done;
} }
} }
if (this->convert) { state = 0;
state = 0; if (this->convert && (res = spa_node_port_enum_params_sync(this->convert,
if ((res = spa_node_port_enum_params_sync(this->convert, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_PARAM_EnumFormat, &state,
SPA_PARAM_EnumFormat, &state, format, &format, &b)) != 1) {
format, &format, &b)) != 1) { debug_params(this, this->convert,
debug_params(this, this->convert, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_PARAM_EnumFormat, format, "convert format", res);
SPA_PARAM_EnumFormat, format, "convert format", res); res = -ENOTSUP;
res = -ENOTSUP; goto done;
goto done;
}
} }
if (format == NULL) { if (format == NULL) {
res = -ENOTSUP; res = -ENOTSUP;
@ -787,18 +937,24 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
switch (SPA_NODE_COMMAND_ID(command)) { switch (SPA_NODE_COMMAND_ID(command)) {
case SPA_NODE_COMMAND_Start: case SPA_NODE_COMMAND_Start:
if ((res = negotiate_format(this)) < 0) spa_log_debug(this->log, "%p: starting %d", this, this->started);
return res; if (this->target != this->follower) {
if ((res = negotiate_buffers(this)) < 0) if (this->started)
return res; return 0;
if ((res = negotiate_format(this)) < 0)
return res;
}
this->ready = true;
this->warned = false;
break; break;
case SPA_NODE_COMMAND_Suspend: case SPA_NODE_COMMAND_Suspend:
configure_format(this, 0, NULL); spa_log_debug(this->log, "%p: suspending", this);
SPA_FALLTHROUGH break;
case SPA_NODE_COMMAND_Pause: case SPA_NODE_COMMAND_Pause:
this->started = false; spa_log_debug(this->log, "%p: pausing", this);
break; break;
case SPA_NODE_COMMAND_Flush: case SPA_NODE_COMMAND_Flush:
spa_log_debug(this->log, "%p: flushing", this);
this->io_buffers.status = SPA_STATUS_OK; this->io_buffers.status = SPA_STATUS_OK;
break; break;
default: default:
@ -809,20 +965,41 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
spa_log_error(this->log, "%p: can't send command %d: %s", spa_log_error(this->log, "%p: can't send command %d: %s",
this, SPA_NODE_COMMAND_ID(command), this, SPA_NODE_COMMAND_ID(command),
spa_strerror(res)); spa_strerror(res));
return res;
} }
if (this->target != this->follower) { if (res >= 0 && this->target != this->follower) {
if ((res = spa_node_send_command(this->follower, command)) < 0) { if ((res = spa_node_send_command(this->follower, command)) < 0) {
spa_log_error(this->log, "%p: can't send command %d: %s", spa_log_error(this->log, "%p: can't send command %d: %s",
this, SPA_NODE_COMMAND_ID(command), this, SPA_NODE_COMMAND_ID(command),
spa_strerror(res)); spa_strerror(res));
return res;
} }
} }
switch (SPA_NODE_COMMAND_ID(command)) { switch (SPA_NODE_COMMAND_ID(command)) {
case SPA_NODE_COMMAND_Start: case SPA_NODE_COMMAND_Start:
this->started = true; if (res < 0) {
spa_log_debug(this->log, "%p: start failed", this);
this->ready = false;
configure_format(this, 0, NULL);
} else {
this->started = true;
spa_log_debug(this->log, "%p: started", this);
}
break;
case SPA_NODE_COMMAND_Suspend:
configure_format(this, 0, NULL);
this->started = false;
this->warned = false;
this->ready = false;
spa_log_debug(this->log, "%p: suspended", this);
break;
case SPA_NODE_COMMAND_Pause:
this->started = false;
this->warned = false;
this->ready = false;
spa_log_debug(this->log, "%p: paused", this);
break;
case SPA_NODE_COMMAND_Flush:
spa_log_debug(this->log, "%p: flushed", this);
break; break;
} }
return res; return res;
@ -866,26 +1043,90 @@ static void convert_node_info(void *data, const struct spa_node_info *info)
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) | (this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE); (info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener) { if (this->add_listener)
this->params[idx].user++; continue;
spa_log_debug(this->log, "param %d changed", info->params[i].id);
} this->params[idx].user++;
spa_log_debug(this->log, "param %d changed", info->params[i].id);
} }
} }
emit_node_info(this, false); emit_node_info(this, false);
} }
static void follower_convert_port_info(void *data,
enum spa_direction direction, uint32_t port_id,
const struct spa_port_info *info)
{
struct impl *this = data;
uint32_t i;
int res;
spa_log_debug(this->log, "%p: convert port info %s %p %08"PRIx64, this,
this->direction == SPA_DIRECTION_INPUT ?
"Input" : "Output", info, info->change_mask);
if (this->convert && info->change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) {
uint32_t idx;
switch (info->params[i].id) {
case SPA_PARAM_Latency:
idx = IDX_Latency;
break;
case SPA_PARAM_Tag:
idx = IDX_Tag;
break;
default:
continue;
}
if (!this->add_listener &&
this->convert_params_flags[idx] == info->params[i].flags)
continue;
this->convert_params_flags[idx] = info->params[i].flags;
if (this->add_listener)
continue;
if (idx == IDX_Latency) {
this->in_recalc++;
res = recalc_latency(this, this->convert, direction, port_id, this->follower);
this->in_recalc--;
spa_log_debug(this->log, "latency: %d (%s)", res,
spa_strerror(res));
}
if (idx == IDX_Tag) {
this->in_recalc++;
res = recalc_tag(this, this->convert, direction, port_id, this->follower);
this->in_recalc--;
spa_log_debug(this->log, "tag: %d (%s)", res,
spa_strerror(res));
}
spa_log_debug(this->log, "param %d changed", info->params[i].id);
}
}
}
static void convert_port_info(void *data, static void convert_port_info(void *data,
enum spa_direction direction, uint32_t port_id, enum spa_direction direction, uint32_t port_id,
const struct spa_port_info *info) const struct spa_port_info *info)
{ {
struct impl *this = data; struct impl *this = data;
struct spa_port_info pi;
if (direction != this->direction) { if (direction != this->direction) {
if (port_id == 0) if (port_id == 0) {
/* handle the converter output port into the follower separately */
follower_convert_port_info(this, direction, port_id, info);
return; return;
else } else
/* the monitor ports are exposed */
port_id--; port_id--;
} else if (info) {
pi = *info;
pi.flags = this->follower_port_flags;
info = &pi;
} }
spa_log_debug(this->log, "%p: port info %d:%d", this, spa_log_debug(this->log, "%p: port info %d:%d", this,
@ -938,6 +1179,8 @@ static void follower_info(void *data, const struct spa_node_info *info)
this->info.flags |= SPA_NODE_FLAG_OUT_PORT_CONFIG; this->info.flags |= SPA_NODE_FLAG_OUT_PORT_CONFIG;
this->info.max_output_ports = MAX_PORTS; this->info.max_output_ports = MAX_PORTS;
} }
SPA_FLAG_UPDATE(this->info.flags, SPA_NODE_FLAG_ASYNC,
this->async && this->follower == this->target);
spa_log_debug(this->log, "%p: follower info %s", this, spa_log_debug(this->log, "%p: follower info %s", this,
this->direction == SPA_DIRECTION_INPUT ? this->direction == SPA_DIRECTION_INPUT ?
@ -974,50 +1217,17 @@ static void follower_info(void *data, const struct spa_node_info *info)
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) | (this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE); (info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (!this->add_listener) { if (this->add_listener)
this->params[idx].user++; continue;
spa_log_debug(this->log, "param %d changed", info->params[i].id);
} this->params[idx].user++;
spa_log_debug(this->log, "param %d changed", info->params[i].id);
} }
} }
emit_node_info(this, false); emit_node_info(this, false);
spa_zero(this->info.props); spa_zero(this->info.props);
this->info.change_mask &= ~SPA_NODE_CHANGE_MASK_PROPS; this->info.change_mask &= ~SPA_NODE_CHANGE_MASK_PROPS;
}
static int recalc_latency(struct impl *this, enum spa_direction direction, uint32_t port_id)
{
struct spa_pod_builder b = { 0 };
uint8_t buffer[1024];
struct spa_pod *param;
uint32_t index = 0;
struct spa_latency_info latency;
int res;
spa_log_debug(this->log, "%p: ", this);
if (this->target == this->follower)
return 0;
while (true) {
spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params_sync(this->follower,
direction, port_id, SPA_PARAM_Latency,
&index, NULL, &param, &b)) != 1)
return res;
if ((res = spa_latency_parse(param, &latency)) < 0)
return res;
if (latency.direction == direction)
break;
}
if ((res = spa_node_port_set_param(this->target,
SPA_DIRECTION_REVERSE(direction), 0,
SPA_PARAM_Latency, 0, param)) < 0)
return res;
return 0;
} }
static void follower_port_info(void *data, static void follower_port_info(void *data,
@ -1033,9 +1243,15 @@ static void follower_port_info(void *data,
return; return;
} }
spa_log_debug(this->log, "%p: follower port info %s %p %08"PRIx64, this, this->follower_port_flags = info->flags &
(SPA_PORT_FLAG_LIVE |
SPA_PORT_FLAG_PHYSICAL |
SPA_PORT_FLAG_TERMINAL);
spa_log_debug(this->log, "%p: follower port info %s %p %08"PRIx64" recalc:%u", this,
this->direction == SPA_DIRECTION_INPUT ? this->direction == SPA_DIRECTION_INPUT ?
"Input" : "Output", info, info->change_mask); "Input" : "Output", info, info->change_mask,
this->in_recalc);
if (info->change_mask & SPA_PORT_CHANGE_MASK_PARAMS) { if (info->change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {
for (i = 0; i < info->n_params; i++) { for (i = 0; i < info->n_params; i++) {
@ -1051,29 +1267,43 @@ static void follower_port_info(void *data,
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
idx = IDX_Latency; idx = IDX_Latency;
break; break;
case SPA_PARAM_Tag:
idx = IDX_Tag;
break;
default: default:
continue; continue;
} }
if (!this->add_listener && if (!this->add_listener &&
this->follower_params_flags[idx] == info->params[i].flags) this->follower_params_flags[idx] == info->params[i].flags)
continue; continue;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->follower_params_flags[idx] = info->params[i].flags; this->follower_params_flags[idx] = info->params[i].flags;
this->params[idx].flags = this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) | (this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE); (info->params[i].flags & SPA_PARAM_INFO_READWRITE);
if (idx == IDX_Latency) { if (this->add_listener)
res = recalc_latency(this, direction, port_id); continue;
if (idx == IDX_Latency && this->in_recalc == 0) {
res = recalc_latency(this, this->follower, direction, port_id, this->target);
spa_log_debug(this->log, "latency: %d (%s)", res, spa_log_debug(this->log, "latency: %d (%s)", res,
spa_strerror(res)); spa_strerror(res));
} }
if (idx == IDX_Tag && this->in_recalc == 0) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS; res = recalc_tag(this, this->follower, direction, port_id, this->target);
if (!this->add_listener) { spa_log_debug(this->log, "tag: %d (%s)", res,
this->params[idx].user++; spa_strerror(res));
spa_log_debug(this->log, "param %d changed", info->params[i].id);
} }
if (idx == IDX_EnumFormat) {
spa_log_debug(this->log, "new formats");
/* we will renegotiate when restarting */
}
this->params[idx].user++;
spa_log_debug(this->log, "param %d changed", info->params[i].id);
} }
} }
emit_node_info(this, false); emit_node_info(this, false);
@ -1124,6 +1354,11 @@ static int follower_ready(void *data, int status)
spa_log_trace_fp(this->log, "%p: ready %d", this, status); spa_log_trace_fp(this->log, "%p: ready %d", this, status);
if (!this->ready) {
spa_log_info(this->log, "%p: ready stopped node", this);
return -EIO;
}
if (this->target != this->follower) { if (this->target != this->follower) {
this->driver = true; this->driver = true;
@ -1152,7 +1387,7 @@ static int follower_reuse_buffer(void *data, uint32_t port_id, uint32_t buffer_i
int res; int res;
struct impl *this = data; struct impl *this = data;
if (this->target != this->follower && this->convert) if (this->convert && this->target != this->follower)
res = spa_node_port_reuse_buffer(this->convert, port_id, buffer_id); res = spa_node_port_reuse_buffer(this->convert, port_id, buffer_id);
else else
res = spa_node_call_reuse_buffer(&this->callbacks, port_id, buffer_id); res = spa_node_call_reuse_buffer(&this->callbacks, port_id, buffer_id);
@ -1187,6 +1422,7 @@ static int impl_node_add_listener(void *object,
spa_log_trace(this->log, "%p: add listener %p", this, listener); spa_log_trace(this->log, "%p: add listener %p", this, listener);
spa_hook_list_isolate(&this->hooks, &save, listener, events, data); spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
if (events->info || events->port_info) { if (events->info || events->port_info) {
this->add_listener = true; this->add_listener = true;
@ -1199,6 +1435,7 @@ static int impl_node_add_listener(void *object,
spa_node_add_listener(this->convert, &l, &convert_node_events, this); spa_node_add_listener(this->convert, &l, &convert_node_events, this);
spa_hook_remove(&l); spa_hook_remove(&l);
} }
this->add_listener = false; this->add_listener = false;
emit_node_info(this, true); emit_node_info(this, true);
@ -1286,7 +1523,6 @@ impl_node_port_set_param(void *object,
const struct spa_pod *param) const struct spa_pod *param)
{ {
struct impl *this = object; struct impl *this = object;
int res;
spa_return_val_if_fail(this != NULL, -EINVAL); spa_return_val_if_fail(this != NULL, -EINVAL);
@ -1295,18 +1531,8 @@ impl_node_port_set_param(void *object,
if (direction != this->direction) if (direction != this->direction)
port_id++; port_id++;
if ((res = spa_node_port_set_param(this->target, direction, port_id, id, return spa_node_port_set_param(this->target, direction, port_id, id,
flags, param)) < 0) flags, param);
return res;
if ((id == SPA_PARAM_Latency) &&
direction == this->direction) {
if ((res = spa_node_port_set_param(this->follower, direction, 0, id,
flags, param)) < 0)
return res;
}
return res;
} }
static int static int
@ -1369,6 +1595,13 @@ static int impl_node_process(void *object)
struct impl *this = object; struct impl *this = object;
int status = 0, fstatus, retry = 8; int status = 0, fstatus, retry = 8;
if (!this->ready) {
if (!this->warned)
spa_log_warn(this->log, "%p: scheduling stopped node", this);
this->warned = true;
return -EIO;
}
spa_log_trace_fp(this->log, "%p: process convert:%p driver:%d", spa_log_trace_fp(this->log, "%p: process convert:%p driver:%d",
this, this->convert, this->driver); this, this->convert, this->driver);
@ -1583,6 +1816,9 @@ impl_init(const struct spa_handle_factory *factory,
info, support, n_support); info, support, n_support);
spa_handle_get_interface(this->hnd_convert, SPA_TYPE_INTERFACE_Node, &iface); spa_handle_get_interface(this->hnd_convert, SPA_TYPE_INTERFACE_Node, &iface);
if (iface == NULL)
return -EINVAL;
this->convert = iface; this->convert = iface;
#endif #endif
this->target = this->convert; this->target = this->convert;
@ -1600,6 +1836,7 @@ impl_init(const struct spa_handle_factory *factory,
this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE); this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE);
this->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE); this->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE);
this->params[IDX_ProcessLatency] = SPA_PARAM_INFO(SPA_PARAM_ProcessLatency, SPA_PARAM_INFO_READWRITE); this->params[IDX_ProcessLatency] = SPA_PARAM_INFO(SPA_PARAM_ProcessLatency, SPA_PARAM_INFO_READWRITE);
this->params[IDX_Tag] = SPA_PARAM_INFO(SPA_PARAM_Tag, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = N_NODE_PARAMS; this->info.n_params = N_NODE_PARAMS;
@ -1607,11 +1844,15 @@ impl_init(const struct spa_handle_factory *factory,
&this->follower_listener, &follower_node_events, this); &this->follower_listener, &follower_node_events, this);
spa_node_set_callbacks(this->follower, &follower_node_callbacks, this); spa_node_set_callbacks(this->follower, &follower_node_callbacks, this);
if (this->convert) // TODO: adapt port bootstrap for arbitrary converter (incl. dummy)
if (this->convert) {
spa_node_add_listener(this->convert, spa_node_add_listener(this->convert,
&this->convert_listener, &convert_node_events, this); &this->convert_listener, &convert_node_events, this);
reconfigure_mode(this, true, this->direction, NULL); configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_convert);
} else {
reconfigure_mode(this, true, this->direction, NULL);
}
link_io(this); link_io(this);