mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2026-02-08 10:06:56 -05:00
remap-source: Use common code
This commit is contained in:
Georg Chini
parent
9f70ad3c95
commit
5d05301663
2 changed files with 14 additions and 322 deletions
|
|
@ -60,7 +60,7 @@ all_modules = [
|
|||
[ 'module-null-source', 'module-null-source.c' ],
|
||||
[ 'module-position-event-sounds', 'module-position-event-sounds.c' ],
|
||||
[ 'module-remap-sink', 'module-remap-sink.c', [], [], [], libvirtual_sink ],
|
||||
[ 'module-remap-source', 'module-remap-source.c' ],
|
||||
[ 'module-remap-source', 'module-remap-source.c', [], [], [], libvirtual_source ],
|
||||
[ 'module-rescue-streams', 'module-rescue-streams.c' ],
|
||||
[ 'module-role-cork', ['module-role-cork.c', 'stream-interaction.c'], 'stream-interaction.h' ],
|
||||
[ 'module-role-ducking', ['module-role-ducking.c', 'stream-interaction.c'], 'stream-interaction.h' ],
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <modules/virtual-source-common.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <pulse/xmalloc.h>
|
||||
|
|
@ -47,6 +49,7 @@ PA_MODULE_USAGE(
|
|||
"source_properties=<properties for the source> "
|
||||
"master=<name of source to filter> "
|
||||
"master_channel_map=<channel map> "
|
||||
"uplink_sink=<name> (optional)"
|
||||
"format=<sample format> "
|
||||
"rate=<sample rate> "
|
||||
"channels=<number of channels> "
|
||||
|
|
@ -57,10 +60,7 @@ PA_MODULE_USAGE(
|
|||
struct userdata {
|
||||
pa_module *module;
|
||||
|
||||
pa_source *source;
|
||||
pa_source_output *source_output;
|
||||
|
||||
bool auto_desc;
|
||||
pa_vsource *vsource;
|
||||
};
|
||||
|
||||
static const char* const valid_modargs[] = {
|
||||
|
|
@ -68,6 +68,7 @@ static const char* const valid_modargs[] = {
|
|||
"source_properties",
|
||||
"master",
|
||||
"master_channel_map",
|
||||
"uplink_sink",
|
||||
"format",
|
||||
"rate",
|
||||
"channels",
|
||||
|
|
@ -77,226 +78,12 @@ static const char* const valid_modargs[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
/* Called from I/O thread context */
|
||||
static int source_process_msg_cb(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
|
||||
struct userdata *u = PA_SOURCE(o)->userdata;
|
||||
|
||||
switch (code) {
|
||||
|
||||
case PA_SOURCE_MESSAGE_GET_LATENCY:
|
||||
|
||||
/* The source is _put() before the source output is, so let's
|
||||
* make sure we don't access it in that time. Also, the
|
||||
* source output is first shut down, the source second. */
|
||||
if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) ||
|
||||
!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state)) {
|
||||
*((int64_t*) data) = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
*((int64_t*) data) =
|
||||
|
||||
/* Get the latency of the master source */
|
||||
pa_source_get_latency_within_thread(u->source_output->source, true) +
|
||||
/* Add the latency internal to our source output on top */
|
||||
pa_bytes_to_usec(pa_memblockq_get_length(u->source_output->thread_info.delay_memblockq), &u->source_output->source->sample_spec);
|
||||
|
||||
/* Add resampler delay */
|
||||
*((int64_t*) data) += pa_resampler_get_delay_usec(u->source_output->thread_info.resampler);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
return pa_source_process_msg(o, code, data, offset, chunk);
|
||||
}
|
||||
|
||||
/* Called from main context */
|
||||
static int source_set_state_in_main_thread_cb(pa_source *s, pa_source_state_t state, pa_suspend_cause_t suspend_cause) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_assert_ref(s);
|
||||
pa_assert_se(u = s->userdata);
|
||||
|
||||
if (!PA_SOURCE_IS_LINKED(state) ||
|
||||
!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->state))
|
||||
return 0;
|
||||
|
||||
pa_source_output_cork(u->source_output, state == PA_SOURCE_SUSPENDED);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Called from I/O thread context */
|
||||
static void source_update_requested_latency_cb(pa_source *s) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_assert_ref(s);
|
||||
pa_assert_se(u = s->userdata);
|
||||
|
||||
if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state) ||
|
||||
!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state))
|
||||
return;
|
||||
|
||||
pa_log_debug("Source update requested latency.");
|
||||
|
||||
/* Just hand this one over to the master source */
|
||||
pa_source_output_set_requested_latency_within_thread(
|
||||
u->source_output,
|
||||
pa_source_get_requested_latency_within_thread(s));
|
||||
}
|
||||
|
||||
/* Called from output thread context */
|
||||
static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_source_output_assert_io_context(o);
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
if (!PA_SOURCE_IS_LINKED(u->source->thread_info.state))
|
||||
return;
|
||||
|
||||
if (!PA_SOURCE_OUTPUT_IS_LINKED(u->source_output->thread_info.state)) {
|
||||
pa_log("push when no link?");
|
||||
return;
|
||||
}
|
||||
|
||||
pa_source_post(u->source, chunk);
|
||||
}
|
||||
|
||||
/* Called from output thread context */
|
||||
static void source_output_process_rewind_cb(pa_source_output *o, size_t nbytes) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_source_output_assert_io_context(o);
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
/* If the source is not yet linked, there is nothing to rewind */
|
||||
if (PA_SOURCE_IS_LINKED(u->source->thread_info.state))
|
||||
pa_source_process_rewind(u->source, nbytes);
|
||||
}
|
||||
|
||||
/* Called from output thread context */
|
||||
static void source_output_update_max_rewind_cb(pa_source_output *o, size_t nbytes) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_source_output_assert_io_context(o);
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
pa_source_set_max_rewind_within_thread(u->source, nbytes);
|
||||
}
|
||||
|
||||
/* Called from output thread context */
|
||||
static void source_output_detach_cb(pa_source_output *o) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_source_output_assert_io_context(o);
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
if (PA_SOURCE_IS_LINKED(u->source->thread_info.state))
|
||||
pa_source_detach_within_thread(u->source);
|
||||
|
||||
pa_source_set_rtpoll(u->source, NULL);
|
||||
}
|
||||
|
||||
/* Called from output thread context */
|
||||
static void source_output_attach_cb(pa_source_output *o) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_source_output_assert_io_context(o);
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
pa_source_set_rtpoll(u->source, o->source->thread_info.rtpoll);
|
||||
pa_source_set_latency_range_within_thread(u->source, o->source->thread_info.min_latency, o->source->thread_info.max_latency);
|
||||
pa_source_set_fixed_latency_within_thread(u->source, o->source->thread_info.fixed_latency);
|
||||
pa_source_set_max_rewind_within_thread(u->source, pa_source_output_get_max_rewind(o));
|
||||
|
||||
if (PA_SOURCE_IS_LINKED(u->source->thread_info.state))
|
||||
pa_source_attach_within_thread(u->source);
|
||||
}
|
||||
|
||||
/* Called from main thread */
|
||||
static void source_output_kill_cb(pa_source_output *o) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_assert_ctl_context();
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
/* The order here matters! We first kill the source so that streams
|
||||
* can properly be moved away while the source output is still connected
|
||||
* to the master. */
|
||||
pa_source_output_cork(u->source_output, true);
|
||||
pa_source_unlink(u->source);
|
||||
pa_source_output_unlink(u->source_output);
|
||||
|
||||
pa_source_output_unref(u->source_output);
|
||||
u->source_output = NULL;
|
||||
|
||||
pa_source_unref(u->source);
|
||||
u->source = NULL;
|
||||
|
||||
pa_module_unload_request(u->module, true);
|
||||
}
|
||||
|
||||
/* Called from output thread context except when cork() is called without valid source. */
|
||||
static void source_output_state_change_cb(pa_source_output *o, pa_source_output_state_t state) {
|
||||
struct userdata *u;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
pa_log_debug("Source output %d state %d.", o->index, state);
|
||||
}
|
||||
|
||||
/* Called from main thread */
|
||||
static void source_output_moving_cb(pa_source_output *o, pa_source *dest) {
|
||||
struct userdata *u;
|
||||
uint32_t idx;
|
||||
pa_source_output *output;
|
||||
|
||||
pa_source_output_assert_ref(o);
|
||||
pa_assert_ctl_context();
|
||||
pa_assert_se(u = o->userdata);
|
||||
|
||||
if (dest) {
|
||||
pa_source_set_asyncmsgq(u->source, dest->asyncmsgq);
|
||||
pa_source_update_flags(u->source, PA_SOURCE_LATENCY|PA_SOURCE_DYNAMIC_LATENCY, dest->flags);
|
||||
} else
|
||||
pa_source_set_asyncmsgq(u->source, NULL);
|
||||
|
||||
/* Propagate asyncmsq change to attached virtual sources */
|
||||
PA_IDXSET_FOREACH(output, u->source->outputs, idx) {
|
||||
if (output->destination_source && output->moving)
|
||||
output->moving(output, u->source);
|
||||
}
|
||||
|
||||
if (u->auto_desc && dest) {
|
||||
const char *k;
|
||||
pa_proplist *pl;
|
||||
|
||||
pl = pa_proplist_new();
|
||||
k = pa_proplist_gets(dest->proplist, PA_PROP_DEVICE_DESCRIPTION);
|
||||
pa_proplist_setf(pl, PA_PROP_DEVICE_DESCRIPTION, "Remapped %s", k ? k : dest->name);
|
||||
|
||||
pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, pl);
|
||||
pa_proplist_free(pl);
|
||||
}
|
||||
}
|
||||
|
||||
int pa__init(pa_module*m) {
|
||||
struct userdata *u;
|
||||
pa_sample_spec ss;
|
||||
pa_resample_method_t resample_method = PA_RESAMPLER_INVALID;
|
||||
pa_channel_map source_map, stream_map;
|
||||
pa_modargs *ma;
|
||||
pa_source *master;
|
||||
pa_source_output_new_data source_output_data;
|
||||
pa_source_new_data source_data;
|
||||
bool remix = true;
|
||||
|
||||
pa_assert(m);
|
||||
|
||||
|
|
@ -331,98 +118,17 @@ int pa__init(pa_module*m) {
|
|||
if (pa_channel_map_equal(&stream_map, &master->channel_map))
|
||||
pa_log_warn("No remapping configured, proceeding nonetheless!");
|
||||
|
||||
if (pa_modargs_get_value_boolean(ma, "remix", &remix) < 0) {
|
||||
pa_log("Invalid boolean remix parameter.");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (pa_modargs_get_resample_method(ma, &resample_method) < 0) {
|
||||
pa_log("Invalid resampling method");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
u = pa_xnew0(struct userdata, 1);
|
||||
u->module = m;
|
||||
m->userdata = u;
|
||||
|
||||
/* Create source */
|
||||
pa_source_new_data_init(&source_data);
|
||||
source_data.driver = __FILE__;
|
||||
source_data.module = m;
|
||||
if (!(source_data.name = pa_xstrdup(pa_modargs_get_value(ma, "source_name", NULL))))
|
||||
source_data.name = pa_sprintf_malloc("%s.remapped", master->name);
|
||||
pa_source_new_data_set_sample_spec(&source_data, &ss);
|
||||
pa_source_new_data_set_channel_map(&source_data, &source_map);
|
||||
pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_MASTER_DEVICE, master->name);
|
||||
pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_CLASS, "filter");
|
||||
/* Create virtual sink */
|
||||
if (!(u->vsource = pa_virtual_source_create(master, "remapped", "Remapped Source", &ss, &source_map,
|
||||
&ss, &stream_map, m, u, ma, false, false)))
|
||||
goto fail;
|
||||
|
||||
if (pa_modargs_get_proplist(ma, "source_properties", source_data.proplist, PA_UPDATE_REPLACE) < 0) {
|
||||
pa_log("Invalid properties.");
|
||||
pa_source_new_data_done(&source_data);
|
||||
if (pa_virtual_source_activate(u->vsource) < 0)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if ((u->auto_desc = !pa_proplist_contains(source_data.proplist, PA_PROP_DEVICE_DESCRIPTION))) {
|
||||
const char *k;
|
||||
|
||||
k = pa_proplist_gets(master->proplist, PA_PROP_DEVICE_DESCRIPTION);
|
||||
pa_proplist_setf(source_data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Remapped %s", k ? k : master->name);
|
||||
}
|
||||
|
||||
u->source = pa_source_new(m->core, &source_data, master->flags & (PA_SOURCE_LATENCY|PA_SOURCE_DYNAMIC_LATENCY));
|
||||
pa_source_new_data_done(&source_data);
|
||||
|
||||
if (!u->source) {
|
||||
pa_log("Failed to create source.");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
u->source->parent.process_msg = source_process_msg_cb;
|
||||
u->source->set_state_in_main_thread = source_set_state_in_main_thread_cb;
|
||||
u->source->update_requested_latency = source_update_requested_latency_cb;
|
||||
|
||||
u->source->userdata = u;
|
||||
|
||||
pa_source_set_asyncmsgq(u->source, master->asyncmsgq);
|
||||
|
||||
/* Create source output */
|
||||
pa_source_output_new_data_init(&source_output_data);
|
||||
source_output_data.driver = __FILE__;
|
||||
source_output_data.module = m;
|
||||
pa_source_output_new_data_set_source(&source_output_data, master, false, true);
|
||||
source_output_data.destination_source = u->source;
|
||||
|
||||
pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_NAME, "Remapped Stream");
|
||||
pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ROLE, "filter");
|
||||
pa_source_output_new_data_set_sample_spec(&source_output_data, &ss);
|
||||
pa_source_output_new_data_set_channel_map(&source_output_data, &stream_map);
|
||||
source_output_data.flags = (remix ? 0 : PA_SOURCE_OUTPUT_NO_REMIX) | PA_SOURCE_OUTPUT_START_CORKED;
|
||||
source_output_data.resample_method = resample_method;
|
||||
|
||||
pa_source_output_new(&u->source_output, m->core, &source_output_data);
|
||||
pa_source_output_new_data_done(&source_output_data);
|
||||
|
||||
if (!u->source_output)
|
||||
goto fail;
|
||||
|
||||
u->source_output->push = source_output_push_cb;
|
||||
u->source_output->process_rewind = source_output_process_rewind_cb;
|
||||
u->source_output->update_max_rewind = source_output_update_max_rewind_cb;
|
||||
u->source_output->kill = source_output_kill_cb;
|
||||
u->source_output->attach = source_output_attach_cb;
|
||||
u->source_output->detach = source_output_detach_cb;
|
||||
u->source_output->state_change = source_output_state_change_cb;
|
||||
u->source_output->moving = source_output_moving_cb;
|
||||
u->source_output->userdata = u;
|
||||
|
||||
u->source->output_from_master = u->source_output;
|
||||
|
||||
/* The order here is important. The output must be put first,
|
||||
* otherwise streams might attach to the source before the
|
||||
* source output is attached to the master. */
|
||||
pa_source_output_put(u->source_output);
|
||||
pa_source_put(u->source);
|
||||
pa_source_output_cork(u->source_output, false);
|
||||
|
||||
pa_modargs_free(ma);
|
||||
|
||||
|
|
@ -443,7 +149,7 @@ int pa__get_n_used(pa_module *m) {
|
|||
pa_assert(m);
|
||||
pa_assert_se(u = m->userdata);
|
||||
|
||||
return pa_source_linked_by(u->source);
|
||||
return pa_source_linked_by(u->vsource->source);
|
||||
}
|
||||
|
||||
void pa__done(pa_module*m) {
|
||||
|
|
@ -454,22 +160,8 @@ void pa__done(pa_module*m) {
|
|||
if (!(u = m->userdata))
|
||||
return;
|
||||
|
||||
/* See comments in source_output_kill_cb() above regarding
|
||||
* destruction order! */
|
||||
|
||||
if (u->source_output)
|
||||
pa_source_output_cork(u->source_output, true);
|
||||
|
||||
if (u->source)
|
||||
pa_source_unlink(u->source);
|
||||
|
||||
if (u->source_output) {
|
||||
pa_source_output_unlink(u->source_output);
|
||||
pa_source_output_unref(u->source_output);
|
||||
}
|
||||
|
||||
if (u->source)
|
||||
pa_source_unref(u->source);
|
||||
if (u->vsource)
|
||||
pa_virtual_source_destroy(u->vsource);
|
||||
|
||||
pa_xfree(u);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue