This file is part of polypaudio.
polypaudio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
+ it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
#include "sample-util.h"
#include "xmalloc.h"
#include "subscribe.h"
+#include "log.h"
#define CONVERT_BUFFER_LENGTH 4096
-struct pa_sink_input* pa_sink_input_new(struct pa_sink *s, const char *name, const struct pa_sample_spec *spec) {
+struct pa_sink_input* pa_sink_input_new(struct pa_sink *s, const char *name, const struct pa_sample_spec *spec, int variable_rate, int resample_method) {
struct pa_sink_input *i;
struct pa_resampler *resampler = NULL;
int r;
char st[256];
- assert(s && spec);
+ assert(s && spec && s->state == PA_SINK_RUNNING);
- if (!pa_sample_spec_equal(spec, &s->sample_spec))
- if (!(resampler = pa_resampler_new(spec, &s->sample_spec, s->core->memblock_stat)))
+ if (pa_idxset_ncontents(s->inputs) >= PA_MAX_INPUTS_PER_SINK) {
+ pa_log(__FILE__": Failed to create sink input: too many inputs per sink.\n");
+ return NULL;
+ }
+
+ if (resample_method < 0)
+ resample_method = s->core->resample_method;
+
+ if (variable_rate || !pa_sample_spec_equal(spec, &s->sample_spec))
+ if (!(resampler = pa_resampler_new(spec, &s->sample_spec, s->core->memblock_stat, resample_method)))
return NULL;
i = pa_xmalloc(sizeof(struct pa_sink_input));
+ i->ref = 1;
+ i->state = PA_SINK_INPUT_RUNNING;
i->name = pa_xstrdup(name);
i->client = NULL;
i->owner = NULL;
i->kill = NULL;
i->get_latency = NULL;
i->userdata = NULL;
+ i->underrun = NULL;
- i->corked = 0;
i->volume = PA_VOLUME_NORM;
+ i->playing = 0;
i->resampled_chunk.memblock = NULL;
i->resampled_chunk.index = i->resampled_chunk.length = 0;
assert(r == 0);
pa_sample_spec_snprint(st, sizeof(st), spec);
- fprintf(stderr, "sink-input: created %u \"%s\" on %u with sample spec \"%s\"\n", i->index, i->name, s->index, st);
+ pa_log(__FILE__": created %u \"%s\" on %u with sample spec \"%s\"\n", i->index, i->name, s->index, st);
pa_subscription_post(s->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index);
return i;
}
-void pa_sink_input_free(struct pa_sink_input* i) {
- assert(i);
+void pa_sink_input_disconnect(struct pa_sink_input *i) {
+ assert(i && i->state != PA_SINK_INPUT_DISCONNECTED && i->sink && i->sink->core);
- assert(i->sink && i->sink->core);
pa_idxset_remove_by_data(i->sink->core->sink_inputs, i, NULL);
pa_idxset_remove_by_data(i->sink->inputs, i, NULL);
+ pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_REMOVE, i->index);
+ i->sink = NULL;
+
+ i->peek = NULL;
+ i->drop = NULL;
+ i->kill = NULL;
+ i->get_latency = NULL;
+
+ i->state = PA_SINK_INPUT_DISCONNECTED;
+}
+
+static void sink_input_free(struct pa_sink_input* i) {
+ assert(i);
+
+ if (i->state != PA_SINK_INPUT_DISCONNECTED)
+ pa_sink_input_disconnect(i);
+
if (i->resampled_chunk.memblock)
pa_memblock_unref(i->resampled_chunk.memblock);
if (i->resampler)
pa_resampler_free(i->resampler);
- pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_REMOVE, i->index);
-
pa_xfree(i->name);
pa_xfree(i);
}
+void pa_sink_input_unref(struct pa_sink_input *i) {
+ assert(i && i->ref >= 1);
+
+ if (!(--i->ref))
+ sink_input_free(i);
+}
+
+struct pa_sink_input* pa_sink_input_ref(struct pa_sink_input *i) {
+ assert(i && i->ref >= 1);
+ i->ref++;
+ return i;
+}
+
void pa_sink_input_kill(struct pa_sink_input*i) {
- assert(i);
+ assert(i && i->ref >= 1);
if (i->kill)
i->kill(i);
}
pa_usec_t pa_sink_input_get_latency(struct pa_sink_input *i) {
- assert(i);
+ pa_usec_t r = 0;
+ assert(i && i->ref >= 1);
if (i->get_latency)
- return i->get_latency(i);
+ r += i->get_latency(i);
+
+ if (i->resampled_chunk.memblock)
+ r += pa_bytes_to_usec(i->resampled_chunk.length, &i->sample_spec);
- return 0;
+ return r;
}
int pa_sink_input_peek(struct pa_sink_input *i, struct pa_memchunk *chunk) {
- assert(i && chunk && i->peek && i->drop);
+ int ret = -1;
+ assert(i && chunk && i->ref >= 1);
- if (i->corked)
- return -1;
-
- if (!i->resampler)
- return i->peek(i, chunk);
+ pa_sink_input_ref(i);
- if (!i->resampled_chunk.memblock) {
+ if (!i->peek || !i->drop || i->state == PA_SINK_INPUT_CORKED)
+ goto finish;
+
+ if (!i->resampler) {
+ ret = i->peek(i, chunk);
+ goto finish;
+ }
+
+ while (!i->resampled_chunk.memblock) {
struct pa_memchunk tchunk;
size_t l;
- int ret;
if ((ret = i->peek(i, &tchunk)) < 0)
- return ret;
+ goto finish;
assert(tchunk.length);
l = pa_resampler_request(i->resampler, CONVERT_BUFFER_LENGTH);
- if (tchunk.length > l)
- tchunk.length = l;
+ if (l > tchunk.length)
+ l = tchunk.length;
- i->drop(i, &tchunk, tchunk.length);
+ i->drop(i, &tchunk, l);
+ tchunk.length = l;
pa_resampler_run(i->resampler, &tchunk, &i->resampled_chunk);
pa_memblock_unref(tchunk.memblock);
assert(i->resampled_chunk.memblock && i->resampled_chunk.length);
*chunk = i->resampled_chunk;
pa_memblock_ref(i->resampled_chunk.memblock);
- return 0;
+
+ ret = 0;
+
+finish:
+
+ if (ret < 0 && i->playing && i->underrun)
+ i->underrun(i);
+
+ i->playing = ret >= 0;
+
+ pa_sink_input_unref(i);
+
+ return ret;
}
void pa_sink_input_drop(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length) {
- assert(i && length);
+ assert(i && length && i->ref >= 1);
if (!i->resampler) {
- i->drop(i, chunk, length);
+ if (i->drop)
+ i->drop(i, chunk, length);
return;
}
}
void pa_sink_input_set_volume(struct pa_sink_input *i, pa_volume_t volume) {
- assert(i && i->sink && i->sink->core);
+ assert(i && i->sink && i->sink->core && i->ref >= 1);
if (i->volume != volume) {
i->volume = volume;
void pa_sink_input_cork(struct pa_sink_input *i, int b) {
int n;
- assert(i);
- n = i->corked && !b;
- i->corked = b;
+ assert(i && i->ref >= 1);
+
+ if (i->state == PA_SINK_INPUT_DISCONNECTED)
+ return;
+
+ n = i->state == PA_SINK_INPUT_CORKED && !b;
+ i->state = b ? PA_SINK_INPUT_CORKED : PA_SINK_INPUT_RUNNING;
if (n)
pa_sink_notify(i->sink);
}
+
+void pa_sink_input_set_rate(struct pa_sink_input *i, uint32_t rate) {
+ assert(i && i->resampler && i->ref >= 1);
+
+ if (i->sample_spec.rate == rate)
+ return;
+
+ i->sample_spec.rate = rate;
+ pa_resampler_set_input_rate(i->resampler, rate);
+}
+
+void pa_sink_input_set_name(struct pa_sink_input *i, const char *name) {
+ assert(i && i->ref >= 1);
+
+ pa_xfree(i->name);
+ i->name = pa_xstrdup(name);
+
+ pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, i->index);
+}