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

audioconvert: only accept UMP on the control port

Browse source
This commit is contained in:
Wim Taymans 2024-07-26 15:18:56 +02:00
parent 94bb5a2dd2
commit 40cd8535eb
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spa/plugins/audioconvert/audioconvert.c
View file

@ -28,6 +28,7 @@
#include <spa/pod/filter.h> #include <spa/pod/filter.h>
#include <spa/pod/dynamic.h> #include <spa/pod/dynamic.h>
#include <spa/debug/types.h> #include <spa/debug/types.h>
#include <spa/control/ump-utils.h>
#include "volume-ops.h" #include "volume-ops.h"
#include "fmt-ops.h" #include "fmt-ops.h"
@ -302,7 +303,7 @@ static void emit_port_info(struct impl *this, struct port *port, bool full)
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_IGNORE_LATENCY, "true"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_IGNORE_LATENCY, "true");
} else if (PORT_IS_CONTROL(this, port->direction, port->id)) { } else if (PORT_IS_CONTROL(this, port->direction, port->id)) {
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_NAME, "control"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_NAME, "control");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "8 bit raw midi"); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_FORMAT_DSP, "32 bit raw UMP");
} }
if (this->group_name[0] != '\0') if (this->group_name[0] != '\0')
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, this->group_name); items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_PORT_GROUP, this->group_name);
@ -1259,17 +1260,19 @@ static int apply_props(struct impl *this, const struct spa_pod *param)
static int apply_midi(struct impl *this, const struct spa_pod *value) static int apply_midi(struct impl *this, const struct spa_pod *value)
{ {
const uint8_t *val = SPA_POD_BODY(value);
uint32_t size = SPA_POD_BODY_SIZE(value);
struct props *p = &this->props; struct props *p = &this->props;
uint8_t data[8];
int size;
size = spa_ump_to_midi(SPA_POD_BODY(value), SPA_POD_BODY_SIZE(value),
data, sizeof(data));
if (size < 3) if (size < 3)
return -EINVAL; return -EINVAL;
if ((val[0] & 0xf0) != 0xb0 || val[1] != 7) if ((data[0] & 0xf0) != 0xb0 || data[1] != 7)
return 0; return 0;
p->volume = val[2] / 127.0f; p->volume = data[2] / 127.0f;
set_volume(this); set_volume(this);
return 1; return 1;
} }
@ -2071,7 +2074,9 @@ static int port_enum_formats(void *object,
*param = spa_pod_builder_add_object(builder, *param = spa_pod_builder_add_object(builder,
SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application), SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control)); SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
SPA_FORMAT_CONTROL_types, SPA_POD_CHOICE_FLAGS_Int(
(1u<<SPA_CONTROL_UMP) | (1u<<SPA_CONTROL_Properties)));
} else { } else {
struct spa_pod_frame f[1]; struct spa_pod_frame f[1];
uint32_t rate = this->io_position ? uint32_t rate = this->io_position ?
@ -2177,7 +2182,9 @@ impl_node_port_enum_params(void *object, int seq,
param = spa_pod_builder_add_object(&b, param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_Format, id, SPA_TYPE_OBJECT_Format, id,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application), SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_application),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control)); SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_control),
SPA_FORMAT_CONTROL_types, SPA_POD_Int(
(1u<<SPA_CONTROL_UMP) | (1u<<SPA_CONTROL_Properties)));
else else
param = spa_format_audio_raw_build(&b, id, &port->format.info.raw); param = spa_format_audio_raw_build(&b, id, &port->format.info.raw);
break; break;
@ -2808,7 +2815,7 @@ static int channelmix_process_apply_sequence(struct impl *this,
if (prev) { if (prev) {
switch (prev->type) { switch (prev->type) {
case SPA_CONTROL_Midi: case SPA_CONTROL_UMP:
apply_midi(this, &prev->value); apply_midi(this, &prev->value);
break; break;
case SPA_CONTROL_Properties: case SPA_CONTROL_Properties: