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: use some defines for the max ports

Browse source
This commit is contained in:
Wim Taymans 2020-12-09 20:32:44 +01:00
parent 606d48a3e8
commit 7d73f0b8d0
7 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/audioconvert/audioadapter.c
View file

@ -42,6 +42,8 @@
#define NAME "audioadapter" #define NAME "audioadapter"
#define MAX_PORTS SPA_AUDIO_MAX_CHANNELS
/** \cond */ /** \cond */
struct impl { struct impl {
@ -632,8 +634,8 @@ static void follower_info(void *data, const struct spa_node_info *info)
else else
this->direction = SPA_DIRECTION_OUTPUT; this->direction = SPA_DIRECTION_OUTPUT;
this->info.max_input_ports = this->direction == SPA_DIRECTION_INPUT ? 128 : 0; this->info.max_input_ports = this->direction == SPA_DIRECTION_INPUT ? MAX_PORTS : 0;
this->info.max_output_ports = this->direction == SPA_DIRECTION_OUTPUT ? 128 : 0; this->info.max_output_ports = this->direction == SPA_DIRECTION_OUTPUT ? MAX_PORTS : 0;
spa_log_debug(this->log, NAME" %p: follower info %s", this, spa_log_debug(this->log, NAME" %p: follower info %s", this,
this->direction == SPA_DIRECTION_INPUT ? this->direction == SPA_DIRECTION_INPUT ?

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

@ -44,6 +44,8 @@
#define NAME "audioconvert" #define NAME "audioconvert"
#define MAX_PORTS SPA_AUDIO_MAX_CHANNELS
struct buffer { struct buffer {
struct spa_list link; struct spa_list link;
#define BUFFER_FLAG_OUT (1 << 0) #define BUFFER_FLAG_OUT (1 << 0)
@ -1239,8 +1241,8 @@ impl_init(const struct spa_handle_factory *factory,
this->info_all = SPA_NODE_CHANGE_MASK_FLAGS | this->info_all = SPA_NODE_CHANGE_MASK_FLAGS |
SPA_NODE_CHANGE_MASK_PARAMS; SPA_NODE_CHANGE_MASK_PARAMS;
this->info = SPA_NODE_INFO_INIT(); this->info = SPA_NODE_INFO_INIT();
this->info.max_input_ports = 128; this->info.max_input_ports = MAX_PORTS;
this->info.max_output_ports = 128; this->info.max_output_ports = MAX_PORTS;
this->info.flags = SPA_NODE_FLAG_RT | this->info.flags = SPA_NODE_FLAG_RT |
SPA_NODE_FLAG_IN_PORT_CONFIG | SPA_NODE_FLAG_IN_PORT_CONFIG |
SPA_NODE_FLAG_OUT_PORT_CONFIG | SPA_NODE_FLAG_OUT_PORT_CONFIG |

2
spa/plugins/audioconvert/channelmix.c
View file

@ -49,7 +49,7 @@
#define DEFAULT_SAMPLES 8192 #define DEFAULT_SAMPLES 8192
#define MAX_BUFFERS 32 #define MAX_BUFFERS 32
#define MAX_DATAS 64 #define MAX_DATAS SPA_AUDIO_MAX_CHANNELS
#define DEFAULT_CONTROL_BUFFER_SIZE 32768 #define DEFAULT_CONTROL_BUFFER_SIZE 32768

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

@ -51,7 +51,7 @@
#define MAX_SAMPLES 8192 #define MAX_SAMPLES 8192
#define MAX_BUFFERS 32 #define MAX_BUFFERS 32
#define MAX_ALIGN 16 #define MAX_ALIGN 16
#define MAX_DATAS 64 #define MAX_DATAS SPA_AUDIO_MAX_CHANNELS
#define PROP_DEFAULT_TRUNCATE false #define PROP_DEFAULT_TRUNCATE false
#define PROP_DEFAULT_DITHER 0 #define PROP_DEFAULT_DITHER 0

4
spa/plugins/audioconvert/merger.c
View file

@ -54,8 +54,8 @@
#define MAX_SAMPLES 8192 #define MAX_SAMPLES 8192
#define MAX_ALIGN 16 #define MAX_ALIGN 16
#define MAX_BUFFERS 32 #define MAX_BUFFERS 32
#define MAX_DATAS 64 #define MAX_DATAS SPA_AUDIO_MAX_CHANNELS
#define MAX_PORTS 64 #define MAX_PORTS SPA_AUDIO_MAX_CHANNELS
struct buffer { struct buffer {
uint32_t id; uint32_t id;

2
spa/plugins/audioconvert/resample.c
View file

@ -994,6 +994,8 @@ impl_init(const struct spa_handle_factory *factory,
this->info = SPA_NODE_INFO_INIT(); this->info = SPA_NODE_INFO_INIT();
this->info_all = SPA_NODE_CHANGE_MASK_FLAGS; this->info_all = SPA_NODE_CHANGE_MASK_FLAGS;
this->info.max_input_ports = 1;
this->info.max_output_ports = 1;
this->info.flags = SPA_NODE_FLAG_RT; this->info.flags = SPA_NODE_FLAG_RT;
port = GET_OUT_PORT(this, 0); port = GET_OUT_PORT(this, 0);

4
spa/plugins/audioconvert/splitter.c
View file

@ -53,8 +53,8 @@
#define MAX_SAMPLES 8192 #define MAX_SAMPLES 8192
#define MAX_ALIGN 16 #define MAX_ALIGN 16
#define MAX_BUFFERS 32 #define MAX_BUFFERS 32
#define MAX_DATAS 64 #define MAX_DATAS SPA_AUDIO_MAX_CHANNELS
#define MAX_PORTS 64 #define MAX_PORTS SPA_AUDIO_MAX_CHANNELS
struct buffer { struct buffer {
uint32_t id; uint32_t id;