mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement pa_source_input_move_to() for moving record streams between sources

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1181 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-03 22:30:45 +00:00
parent ddc69fccb5
commit 2d00de5851
2 changed files with 77 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/pulsecore/source-output.c
View file

@ -79,8 +79,10 @@ pa_source_output* pa_source_output_new(
resample_method = s->core->resample_method;
if (!pa_sample_spec_equal(&s->sample_spec, spec) || !pa_channel_map_equal(&s->channel_map, map))
if (!(resampler = pa_resampler_new(&s->sample_spec, &s->channel_map, spec, map, s->core->memblock_stat, resample_method)))
if (!(resampler = pa_resampler_new(&s->sample_spec, &s->channel_map, spec, map, s->core->memblock_stat, resample_method))) {
pa_log_warn(__FILE__": Unsupported resampling operation.");
return NULL;
}
o = pa_xnew(pa_source_output, 1);
o->ref = 1;
@ -100,6 +102,7 @@ pa_source_output* pa_source_output_new(
o->userdata = NULL;
o->resampler = resampler;
o->resample_method = resample_method;
assert(s->core);
r = pa_idxset_put(s->core->source_outputs, o, &o->index);
@ -112,6 +115,9 @@ pa_source_output* pa_source_output_new(
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_NEW, o->index);
/* We do not call pa_source_notify() here, because the virtual
* functions have not yet been initialized */
return o;
}
@ -166,7 +172,6 @@ pa_source_output* pa_source_output_ref(pa_source_output *o) {
return o;
}
void pa_source_output_kill(pa_source_output*o) {
assert(o);
assert(o->ref >= 1);
@ -221,13 +226,20 @@ pa_usec_t pa_source_output_get_latency(pa_source_output *o) {
}
void pa_source_output_cork(pa_source_output *o, int b) {
int n;
assert(o);
assert(o->ref >= 1);
if (o->state == PA_SOURCE_OUTPUT_DISCONNECTED)
return;
n = o->state == PA_SOURCE_OUTPUT_CORKED && !b;
o->state = b ? PA_SOURCE_OUTPUT_CORKED : PA_SOURCE_OUTPUT_RUNNING;
if (n)
pa_source_notify(o->source);
}
pa_resample_method_t pa_source_output_get_resample_method(pa_source_output *o) {
@ -235,7 +247,66 @@ pa_resample_method_t pa_source_output_get_resample_method(pa_source_output *o) {
assert(o->ref >= 1);
if (!o->resampler)
return PA_RESAMPLER_INVALID;
return o->resample_method;
return pa_resampler_get_method(o->resampler);
}
int pa_source_output_move_to(pa_source_output *o, pa_source *dest) {
pa_source *origin;
pa_resampler *new_resampler;
assert(o);
assert(o->ref >= 1);
assert(dest);
origin = o->source;
if (dest == origin)
return 0;
if (pa_idxset_size(dest->outputs) >= PA_MAX_OUTPUTS_PER_SOURCE) {
pa_log_warn(__FILE__": Failed to move source output: too many outputs per source.");
return -1;
}
if (o->resampler &&
pa_sample_spec_equal(&origin->sample_spec, &dest->sample_spec) &&
pa_channel_map_equal(&origin->channel_map, &dest->channel_map))
/* Try to reuse the old resampler if possible */
new_resampler = o->resampler;
else if (!pa_sample_spec_equal(&o->sample_spec, &dest->sample_spec) ||
!pa_channel_map_equal(&o->channel_map, &dest->channel_map)) {
/* Okey, we need a new resampler for the new sink */
if (!(new_resampler = pa_resampler_new(
&dest->sample_spec, &dest->channel_map,
&o->sample_spec, &o->channel_map,
dest->core->memblock_stat,
o->resample_method))) {
pa_log_warn(__FILE__": Unsupported resampling operation.");
return -1;
}
}
/* Okey, let's move it */
pa_idxset_remove_by_data(origin->outputs, o, NULL);
pa_idxset_put(dest->outputs, o, NULL);
o->source = dest;
/* Replace resampler */
if (new_resampler != o->resampler) {
if (o->resampler)
pa_resampler_free(o->resampler);
o->resampler = new_resampler;
}
/* Notify everyone */
pa_subscription_post(o->source->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
pa_source_notify(o->source);
return 0;
}

3
src/pulsecore/source-output.h
View file

@ -58,6 +58,7 @@ struct pa_source_output {
pa_usec_t (*get_latency) (pa_source_output *o);
pa_resampler* resampler;
pa_resample_method_t resample_method;
void *userdata;
};
@ -89,4 +90,6 @@ void pa_source_output_cork(pa_source_output *i, int b);
pa_resample_method_t pa_source_output_get_resample_method(pa_source_output *o);
int pa_source_output_move_to(pa_source_output *o, pa_source *dest);
#endif