mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module/roc-*: implement audio.rate

Browse source
This commit is contained in:
Julian Picht 2022-12-13 11:43:46 +01:00
parent 89ac6b3535
commit b47e799c9a
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-roc-sink.c
View file

@ -95,6 +95,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define ROC_DEFAULT_IP "0.0.0.0" #define ROC_DEFAULT_IP "0.0.0.0"
#define ROC_DEFAULT_SOURCE_PORT 10001 #define ROC_DEFAULT_SOURCE_PORT 10001
#define ROC_DEFAULT_REPAIR_PORT 10002 #define ROC_DEFAULT_REPAIR_PORT 10002
#define ROC_DEFAULT_RATE 44100
struct module_roc_sink_data { struct module_roc_sink_data {
struct pw_impl_module *module; struct pw_impl_module *module;
@ -119,6 +120,7 @@ struct module_roc_sink_data {
roc_sender *sender; roc_sender *sender;
roc_fec_code fec_code; roc_fec_code fec_code;
uint32_t rate;
char *local_ip; char *local_ip;
char *remote_ip; char *remote_ip;
int remote_source_port; int remote_source_port;
@ -308,13 +310,13 @@ static int roc_sink_setup(struct module_roc_sink_data *data)
memset(&sender_config, 0, sizeof(sender_config)); memset(&sender_config, 0, sizeof(sender_config));
sender_config.frame_sample_rate = 44100; sender_config.frame_sample_rate = data->rate;
sender_config.frame_channels = ROC_CHANNEL_SET_STEREO; sender_config.frame_channels = ROC_CHANNEL_SET_STEREO;
sender_config.frame_encoding = ROC_FRAME_ENCODING_PCM_FLOAT; sender_config.frame_encoding = ROC_FRAME_ENCODING_PCM_FLOAT;
sender_config.fec_code = data->fec_code; sender_config.fec_code = data->fec_code;
/* Fixed to be the same as ROC sender config above */ /* Fixed to be the same as ROC sender config above */
info.rate = 44100; info.rate = data->rate;
info.channels = 2; info.channels = 2;
info.format = SPA_AUDIO_FORMAT_F32; info.format = SPA_AUDIO_FORMAT_F32;
info.position[0] = SPA_AUDIO_CHANNEL_FL; info.position[0] = SPA_AUDIO_CHANNEL_FL;
@ -458,6 +460,10 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if ((str = pw_properties_get(capture_props, PW_KEY_MEDIA_CLASS)) == NULL) if ((str = pw_properties_get(capture_props, PW_KEY_MEDIA_CLASS)) == NULL)
pw_properties_set(capture_props, PW_KEY_MEDIA_CLASS, "Audio/Sink"); pw_properties_set(capture_props, PW_KEY_MEDIA_CLASS, "Audio/Sink");
data->rate = pw_properties_get_uint32(capture_props, PW_KEY_AUDIO_RATE, data->rate);
if (data->rate == 0)
data->rate = ROC_DEFAULT_RATE;
if ((str = pw_properties_get(props, "remote.ip")) != NULL) { if ((str = pw_properties_get(props, "remote.ip")) != NULL) {
data->remote_ip = strdup(str); data->remote_ip = strdup(str);
pw_properties_set(props, "remote.ip", NULL); pw_properties_set(props, "remote.ip", NULL);

10
src/modules/module-roc-source.c
View file

@ -99,6 +99,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
#define ROC_DEFAULT_SOURCE_PORT 10001 #define ROC_DEFAULT_SOURCE_PORT 10001
#define ROC_DEFAULT_REPAIR_PORT 10002 #define ROC_DEFAULT_REPAIR_PORT 10002
#define ROC_DEFAULT_SESS_LATENCY 200 #define ROC_DEFAULT_SESS_LATENCY 200
#define ROC_DEFAULT_RATE 44100
struct module_roc_source_data { struct module_roc_source_data {
struct pw_impl_module *module; struct pw_impl_module *module;
@ -125,6 +126,7 @@ struct module_roc_source_data {
roc_resampler_profile resampler_profile; roc_resampler_profile resampler_profile;
roc_fec_code fec_code; roc_fec_code fec_code;
uint32_t rate;
char *local_ip; char *local_ip;
int local_source_port; int local_source_port;
int local_repair_port; int local_repair_port;
@ -329,13 +331,13 @@ static int roc_source_setup(struct module_roc_source_data *data)
} }
spa_zero(receiver_config); spa_zero(receiver_config);
receiver_config.frame_sample_rate = 44100; receiver_config.frame_sample_rate = data->rate;
receiver_config.frame_channels = ROC_CHANNEL_SET_STEREO; receiver_config.frame_channels = ROC_CHANNEL_SET_STEREO;
receiver_config.frame_encoding = ROC_FRAME_ENCODING_PCM_FLOAT; receiver_config.frame_encoding = ROC_FRAME_ENCODING_PCM_FLOAT;
receiver_config.resampler_profile = data->resampler_profile; receiver_config.resampler_profile = data->resampler_profile;
/* Fixed to be the same as ROC receiver config above */ /* Fixed to be the same as ROC receiver config above */
info.rate = 44100; info.rate = data->rate;
info.channels = 2; info.channels = 2;
info.format = SPA_AUDIO_FORMAT_F32; info.format = SPA_AUDIO_FORMAT_F32;
info.position[0] = SPA_AUDIO_CHANNEL_FL; info.position[0] = SPA_AUDIO_CHANNEL_FL;
@ -487,6 +489,10 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if (pw_properties_get(playback_props, PW_KEY_NODE_NETWORK) == NULL) if (pw_properties_get(playback_props, PW_KEY_NODE_NETWORK) == NULL)
pw_properties_set(playback_props, PW_KEY_NODE_NETWORK, "true"); pw_properties_set(playback_props, PW_KEY_NODE_NETWORK, "true");
data->rate = pw_properties_get_uint32(playback_props, PW_KEY_AUDIO_RATE, data->rate);
if (data->rate == 0)
data->rate = ROC_DEFAULT_RATE;
if ((str = pw_properties_get(props, "local.ip")) != NULL) { if ((str = pw_properties_get(props, "local.ip")) != NULL) {
data->local_ip = strdup(str); data->local_ip = strdup(str);
pw_properties_set(props, "local.ip", NULL); pw_properties_set(props, "local.ip", NULL);