diff options
| author | Peter Meerwald <p.meerwald@bct-electronic.com> | 2013-11-29 15:32:43 +0100 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-12-05 11:04:19 +0200 |
| commit | 5f7dfd9b91755a2b8a26951de44a656e3c99533f (patch) | |
| tree | 484c656e808da5391c4b6c887f5d21c2768de6a9 | |
| parent | f8e0b8659216209fe75bb9f1f49da7682320ae42 (diff) | |
module-remap-sink: Add resample_method argument
the main intent is to make testing different sample rate resampling
implementations easier; so far there is only global control via
resample-method (command line argument and /etc/pulse/daemon.conf)
module-remap-*'s only purpose is resampling (comprising format conversion,
channel remapping, sample rate adjustment), it can easily be introduced
into any audio pipeline
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
| -rw-r--r-- | src/modules/module-remap-sink.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/modules/module-remap-sink.c b/src/modules/module-remap-sink.c index 67e8da87f..274f9f2fa 100644 --- a/src/modules/module-remap-sink.c +++ b/src/modules/module-remap-sink.c @@ -48,6 +48,7 @@ PA_MODULE_USAGE( "rate=<sample rate> " "channels=<number of channels> " "channel_map=<channel map> " + "resample_method=<resampler> " "remix=<remix channels?>"); struct userdata { @@ -68,6 +69,7 @@ static const char* const valid_modargs[] = { "rate", "channels", "channel_map", + "resample_method", "remix", NULL }; @@ -318,6 +320,7 @@ static void sink_input_moving_cb(pa_sink_input *i, pa_sink *dest) { 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 sink_map, stream_map; pa_modargs *ma; pa_sink *master; @@ -363,6 +366,11 @@ int pa__init(pa_module*m) { 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; @@ -418,6 +426,7 @@ int pa__init(pa_module*m) { pa_sink_input_new_data_set_sample_spec(&sink_input_data, &ss); pa_sink_input_new_data_set_channel_map(&sink_input_data, &stream_map); sink_input_data.flags = (remix ? 0 : PA_SINK_INPUT_NO_REMIX); + sink_input_data.resample_method = resample_method; pa_sink_input_new(&u->sink_input, m->core, &sink_input_data); pa_sink_input_new_data_done(&sink_input_data); |