mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

null-sink: accept our custom format as well

Browse source
This commit is contained in:
Wim Taymans 2023-02-23 12:04:13 +01:00
parent 8aefdd8a6a
commit eca4049a38
1 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

47
spa/plugins/support/null-audio-sink.c
View file

@ -577,6 +577,33 @@ static int clear_buffers(struct impl *this, struct port *port)
return 0; return 0;
} }
static int calc_width(struct spa_audio_info *info)
{
switch (info->info.raw.format) {
case SPA_AUDIO_FORMAT_U8:
case SPA_AUDIO_FORMAT_U8P:
case SPA_AUDIO_FORMAT_S8:
case SPA_AUDIO_FORMAT_S8P:
case SPA_AUDIO_FORMAT_ULAW:
case SPA_AUDIO_FORMAT_ALAW:
return 1;
case SPA_AUDIO_FORMAT_S16P:
case SPA_AUDIO_FORMAT_S16:
case SPA_AUDIO_FORMAT_S16_OE:
return 2;
case SPA_AUDIO_FORMAT_S24P:
case SPA_AUDIO_FORMAT_S24:
case SPA_AUDIO_FORMAT_S24_OE:
return 3;
case SPA_AUDIO_FORMAT_F64P:
case SPA_AUDIO_FORMAT_F64:
case SPA_AUDIO_FORMAT_F64_OE:
return 8;
default:
return 4;
}
}
static int static int
port_set_format(struct impl *this, port_set_format(struct impl *this,
enum spa_direction direction, enum spa_direction direction,
@ -608,15 +635,21 @@ port_set_format(struct impl *this,
info.info.raw.channels > SPA_AUDIO_MAX_CHANNELS) info.info.raw.channels > SPA_AUDIO_MAX_CHANNELS)
return -EINVAL; return -EINVAL;
if (info.info.raw.format == SPA_AUDIO_FORMAT_F32) { if (this->props.format != 0) {
port->bpf = 4 * info.info.raw.channels; if (this->props.format != info.info.raw.format)
port->blocks = 1; return -EINVAL;
} else if (info.info.raw.format == SPA_AUDIO_FORMAT_F32P) { } else if (info.info.raw.format != SPA_AUDIO_FORMAT_F32P &&
port->bpf = 4; info.info.raw.format != SPA_AUDIO_FORMAT_F32) {
port->blocks = info.info.raw.channels;
} else
return -EINVAL; return -EINVAL;
}
port->bpf = calc_width(&info);
if (SPA_AUDIO_FORMAT_IS_PLANAR(info.info.raw.format)) {
port->blocks = info.info.raw.channels;
} else {
port->blocks = 1;
port->bpf *= info.info.raw.channels;
}
port->current_format = info; port->current_format = info;
port->have_format = true; port->have_format = true;
} }