<div dir="auto"><div><div class="gmail_extra"><br><div class="gmail_quote">2017. 4. 9. 오후 6:43에 "Georg Chini" <<a href="mailto:georg@chini.tk">georg@chini.tk</a>>님이 작성:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="elided-text">On 07.04.2017 16:47, KimJeongYeon wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Currently, 'filter-apply' cannot load 'virtual-surround-sink' filter module.<br>
Because, it always fails due to argument mismatching between 'filter-apply' and 'virtual-surround-sink'.<br>
(e.g 'master' used instead of 'sink_master') To solve this issue, added 'sink_master' argument.<br>
Additionally, supports autoloaded feature too.<br>
<br>
Signed-off-by: KimJeongYeon <<a href="mailto:jeongyeon.kim@samsung.com" target="_blank">jeongyeon.kim@samsung.com</a>><br>
---<br>
src/modules/module-virtual-sur<wbr>round-sink.c | 41 ++++++++++++++++++++++++++----<br>
1 file changed, 36 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/modules/module-virtual-s<wbr>urround-sink.c b/src/modules/module-virtual-s<wbr>urround-sink.c<br>
index 4a53623..63ab679 100644<br>
--- a/src/modules/module-virtual-s<wbr>urround-sink.c<br>
+++ b/src/modules/module-virtual-s<wbr>urround-sink.c<br>
@@ -51,6 +51,7 @@ PA_MODULE_USAGE(<br>
_("sink_name=<name for the sink> "<br>
"sink_properties=<properties for the sink> "<br>
"master=<name of sink to filter> "<br>
+ "sink_master=<name of sink to filter> "<br>
"format=<sample format> "<br>
"rate=<sample rate> "<br>
"channels=<number of channels> "<br>
@@ -58,9 +59,11 @@ PA_MODULE_USAGE(<br>
"use_volume_sharing=<yes or no> "<br>
"force_flat_volume=<yes or no> "<br>
"hrir=/path/to/left_hrir.wav "<br>
+ "autoloaded=<set if this module is being loaded automatically> "<br>
));<br>
#define MEMBLOCKQ_MAXLENGTH (16*1024*1024)<br>
+#define DEFAULT_AUTOLOADED false<br>
struct userdata {<br>
pa_module *module;<br>
@@ -87,12 +90,15 @@ struct userdata {<br>
float *input_buffer;<br>
int input_buffer_offset;<br>
+<br>
+ bool autoloaded;<br>
};<br>
static const char* const valid_modargs[] = {<br>
"sink_name",<br>
"sink_properties",<br>
- "master",<br>
+ "master", /* Will be deprecated. */<br>
+ "sink_master",<br>
"format",<br>
"rate",<br>
"channels",<br>
@@ -100,6 +106,7 @@ static const char* const valid_modargs[] = {<br>
"use_volume_sharing",<br>
"force_flat_volume",<br>
"hrir",<br>
+ "autoloaded",<br>
NULL<br>
};<br>
@@ -428,6 +435,19 @@ static void sink_input_state_change_cb(pa_<wbr>sink_input *i, pa_sink_input_state_t s<br>
}<br>
/* Called from main context */<br>
+static bool sink_input_may_move_to_cb(pa_s<wbr>ink_input *i, pa_sink *dest) {<br>
+ struct userdata *u;<br>
+<br>
+ pa_sink_input_assert_ref(i);<br>
+ pa_assert_se(u = i->userdata);<br>
+<br>
+ if (u->autoloaded)<br>
+ return false;<br>
</blockquote>
<br></div>
Why can't the sink input move when the filter is auto-loaded? Isn't it perfectly<br>
normal to change the sink even in that situation? What if the original sink goes<br>
away, would you then prefer to kill the stream?</blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">Currently, filter-apply loads filters using 'autoloaded=1' by default to prevent move.</div><div dir="auto">I think it is original idea of filter-apply.</div><div dir="auto">echo-cancel, equalizer-sink are already adopt it.</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="elided-text">
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+ return u->sink != dest;<br>
+}<br>
+<br>
+/* Called from main context */<br>
static void sink_input_moving_cb(pa_sink_i<wbr>nput *i, pa_sink *dest) {<br>
struct userdata *u;<br>
@@ -561,7 +581,7 @@ int pa__init(pa_module*m) {<br>
pa_sample_spec ss, sink_input_ss;<br>
pa_channel_map map, sink_input_map;<br>
pa_modargs *ma;<br>
- pa_sink *master=NULL;<br>
+ pa_sink *master = NULL;<br>
pa_sink_input_new_data sink_input_data;<br>
pa_sink_new_data sink_data;<br>
bool use_volume_sharing = true;<br>
@@ -591,9 +611,13 @@ int pa__init(pa_module*m) {<br>
goto fail;<br>
}<br>
- if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "master", NULL), PA_NAMEREG_SINK))) {<br>
- pa_log("Master sink not found");<br>
- goto fail;<br>
+ if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "sink_master", NULL), PA_NAMEREG_SINK))) {<br>
+ pa_log("Master sink not found at 'sink_master' argument.");<br>
+ if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "master", NULL), PA_NAMEREG_SINK))) {<br>
+ pa_log("Master sink not found at 'master' argument.");<br>
+ goto fail;<br>
+ } else<br>
+ pa_log("Argument 'master' will be deprecated, please use 'sink_master' instead.");<br>
}<br>
</blockquote>
<br></div>
I would remove the first log message and change the second simply to<br>
"Master sink not found". The additional log message does not provide<br>
any useful information since you already include a message that the<br>
"master" argument is deprecated.</blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">Ok, I got it. I'll submit patch soon.</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="elided-text"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
pa_assert(master);<br>
@@ -672,6 +696,12 @@ int pa__init(pa_module*m) {<br>
goto fail;<br>
}<br>
+ u->autoloaded = DEFAULT_AUTOLOADED;<br>
+ if (pa_modargs_get_value_boolean(<wbr>ma, "autoloaded", &u->autoloaded) < 0) {<br>
+ pa_log("Failed to parse autoloaded value");<br>
+ goto fail;<br>
+ }<br>
+<br>
if ((u->auto_desc = !pa_proplist_contains(sink_dat<wbr>a.proplist, PA_PROP_DEVICE_DESCRIPTION))) {<br>
const char *z;<br>
@@ -731,6 +761,7 @@ int pa__init(pa_module*m) {<br>
u->sink_input->attach = sink_input_attach_cb;<br>
u->sink_input->detach = sink_input_detach_cb;<br>
u->sink_input->state_change = sink_input_state_change_cb;<br>
+ u->sink_input->may_move_to = sink_input_may_move_to_cb;<br>
u->sink_input->moving = sink_input_moving_cb;<br>
u->sink_input->volume_changed = use_volume_sharing ? NULL : sink_input_volume_changed_cb;<br>
u->sink_input->mute_changed = sink_input_mute_changed_cb;<br>
</blockquote>
<br>
<br>
</div></blockquote></div><br></div></div></div>