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

fmtconvert: fix format enumeration

Browse source 
Even if the other pad is already negotiated, we can convert all
formats to F32.
This commit is contained in:
Wim Taymans 2019-05-09 09:35:03 +02:00
parent ecde090a1f
commit 41ab051b68
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
spa/plugins/audioconvert/fmtconvert.c
View file

@ -87,11 +87,11 @@ struct port {
struct spa_port_info info; struct spa_port_info info;
struct spa_param_info params[8]; struct spa_param_info params[8];
bool have_format;
struct spa_audio_info format; struct spa_audio_info format;
uint32_t stride; uint32_t stride;
uint32_t blocks; uint32_t blocks;
uint32_t size; uint32_t size;
unsigned int have_format:1;
struct buffer buffers[MAX_BUFFERS]; struct buffer buffers[MAX_BUFFERS];
uint32_t n_buffers; uint32_t n_buffers;
@ -117,10 +117,9 @@ struct impl {
uint32_t remap[SPA_AUDIO_MAX_CHANNELS]; uint32_t remap[SPA_AUDIO_MAX_CHANNELS];
bool started;
uint32_t cpu_flags; uint32_t cpu_flags;
struct convert conv; struct convert conv;
unsigned int started:1;
unsigned int is_passthrough:1; unsigned int is_passthrough:1;
}; };
@ -318,14 +317,14 @@ static int port_enum_formats(struct spa_node *node,
port = GET_PORT(this, direction, port_id); port = GET_PORT(this, direction, port_id);
other = GET_PORT(this, SPA_DIRECTION_REVERSE(direction), 0); other = GET_PORT(this, SPA_DIRECTION_REVERSE(direction), 0);
spa_log_debug(this->log, NAME " %p: enum %p", this, other); spa_log_debug(this->log, NAME " %p: enum %p %d %d", this, other, port->have_format, other->have_format);
switch (index) { switch (index) {
case 0: case 0:
if (port->have_format) { if (port->have_format) {
*param = spa_format_audio_raw_build(builder, *param = spa_format_audio_raw_build(builder,
SPA_PARAM_EnumFormat, &port->format.info.raw); SPA_PARAM_EnumFormat, &port->format.info.raw);
} }
else if (other->have_format) { else if (other->have_format && other->format.info.raw.format != SPA_AUDIO_FORMAT_F32P) {
struct spa_audio_info info; struct spa_audio_info info;
struct spa_pod_frame f; struct spa_pod_frame f;
@ -439,33 +438,33 @@ impl_node_port_enum_params(struct spa_node *node, int seq,
case SPA_PARAM_Buffers: case SPA_PARAM_Buffers:
{ {
uint32_t buffers;
void *pod;
if (!port->have_format) if (!port->have_format)
return -EIO; return -EIO;
if (result.index > 0) if (result.index > 0)
return 0; return 0;
if (other->n_buffers > 0) { if (other->n_buffers > 0) {
buffers = other->n_buffers;
pod = &SPA_POD_INIT_Int(other->size / other->stride * port->stride);
} else {
buffers = 1;
pod = &SPA_POD_INIT_Choice(SPA_CHOICE_Range,
int32_t, SPA_TYPE_Int, 3,
2048 * port->stride,
16 * port->stride,
INT32_MAX / port->stride);
}
param = spa_pod_builder_add_object(&b, param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamBuffers, id, SPA_TYPE_OBJECT_ParamBuffers, id,
SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(buffers, 1, MAX_BUFFERS), SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(other->n_buffers, 1, MAX_BUFFERS),
SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(port->blocks), SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(port->blocks),
SPA_PARAM_BUFFERS_size, SPA_POD_Pod(pod), SPA_PARAM_BUFFERS_size, SPA_POD_Int(other->size / other->stride * port->stride),
SPA_PARAM_BUFFERS_stride, SPA_POD_Int(port->stride), SPA_PARAM_BUFFERS_stride, SPA_POD_Int(port->stride),
SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); SPA_PARAM_BUFFERS_align, SPA_POD_Int(16));
} else {
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamBuffers, id,
SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(1, 1, MAX_BUFFERS),
SPA_PARAM_BUFFERS_blocks, SPA_POD_Int(port->blocks),
SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(
2048 * port->stride,
16 * port->stride,
INT32_MAX / port->stride),
SPA_PARAM_BUFFERS_stride, SPA_POD_Int(port->stride),
SPA_PARAM_BUFFERS_align, SPA_POD_Int(16));
}
break; break;
} }
case SPA_PARAM_Meta: case SPA_PARAM_Meta:
@ -554,6 +553,7 @@ static int port_set_format(struct spa_node *node,
if (port->have_format) { if (port->have_format) {
port->have_format = false; port->have_format = false;
clear_buffers(this, port); clear_buffers(this, port);
if (this->conv.free)
convert_free(&this->conv); convert_free(&this->conv);
} }
} else { } else {