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 "source-output.h"
#include "source.h"
#include "sample.h"
-
+#include "scache.h"
+#include "sample-util.h"
#include "authkey.h"
+#include "debug.h"
+#include "namereg.h"
+#include "xmalloc.h"
+#include "log.h"
#define DEFAULT_COOKIE_FILE ".esd_auth"
#define RECORD_BUFFER_SECONDS (5)
#define RECORD_BUFFER_FRAGMENTS (100)
+#define MAX_CACHE_SAMPLE_SIZE (1024000)
+
+#define SCACHE_PREFIX "esound."
+
/* This is heavily based on esound's code */
struct connection {
uint32_t index;
+ int dead;
struct pa_protocol_esound *protocol;
struct pa_iochannel *io;
struct pa_client *client;
struct pa_sink_input *sink_input;
struct pa_source_output *source_output;
struct pa_memblockq *input_memblockq, *output_memblockq;
- void *fixed_source;
+ struct pa_defer_event *defer_event;
+
struct {
struct pa_memblock *current_memblock;
size_t memblock_index, fragment_size;
} playback;
+
+ struct {
+ struct pa_memchunk memchunk;
+ char *name;
+ struct pa_sample_spec sample_spec;
+ } scache;
};
struct pa_protocol_esound {
struct pa_core *core;
struct pa_socket_server *server;
struct pa_idxset *connections;
- uint32_t sink_index, source_index;
+ char *sink_name, *source_name;
unsigned n_player;
uint8_t esd_key[ESD_KEY_LEN];
};
const char *description;
} esd_proto_handler_info_t;
-static void sink_input_drop_cb(struct pa_sink_input *i, size_t length);
+static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length);
static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk);
static void sink_input_kill_cb(struct pa_sink_input *i);
-static uint32_t sink_input_get_latency_cb(struct pa_sink_input *i);
+static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i);
+static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o);
static void source_output_push_cb(struct pa_source_output *o, const struct pa_memchunk *chunk);
static void source_output_kill_cb(struct pa_source_output *o);
static int esd_proto_server_info(struct connection *c, esd_proto_t request, const void *data, size_t length);
static int esd_proto_all_info(struct connection *c, esd_proto_t request, const void *data, size_t length);
static int esd_proto_stream_pan(struct connection *c, esd_proto_t request, const void *data, size_t length);
+static int esd_proto_sample_cache(struct connection *c, esd_proto_t request, const void *data, size_t length);
+static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t request, const void *data, size_t length);
+static int esd_proto_sample_get_id(struct connection *c, esd_proto_t request, const void *data, size_t length);
+static int esd_proto_standby_or_resume(struct connection *c, esd_proto_t request, const void *data, size_t length);
/* the big map of protocol handler info */
static struct proto_handler proto_map[ESD_PROTO_MAX] = {
{ ESD_NAME_MAX + 2 * sizeof(int), esd_proto_stream_record, "stream rec" },
{ ESD_NAME_MAX + 2 * sizeof(int), esd_proto_stream_record, "stream mon" },
- { ESD_NAME_MAX + 3 * sizeof(int), NULL, "sample cache" },
- { sizeof(int), NULL, "sample free" },
- { sizeof(int), NULL, "sample play" },
+ { ESD_NAME_MAX + 3 * sizeof(int), esd_proto_sample_cache, "sample cache" }, /* 6 */
+ { sizeof(int), esd_proto_sample_free_or_play, "sample free" },
+ { sizeof(int), esd_proto_sample_free_or_play, "sample play" }, /* 8 */
{ sizeof(int), NULL, "sample loop" },
{ sizeof(int), NULL, "sample stop" },
{ -1, NULL, "TODO: sample kill" },
- { ESD_KEY_LEN + sizeof(int), NULL, "standby" },
- { ESD_KEY_LEN + sizeof(int), NULL, "resume" },
+ { ESD_KEY_LEN + sizeof(int), esd_proto_standby_or_resume, "standby" }, /* NOOP! */
+ { ESD_KEY_LEN + sizeof(int), esd_proto_standby_or_resume, "resume" }, /* NOOP! */ /* 13 */
- { ESD_NAME_MAX, NULL, "sample getid" },
+ { ESD_NAME_MAX, esd_proto_sample_get_id, "sample getid" }, /* 14 */
{ ESD_NAME_MAX + 2 * sizeof(int), NULL, "stream filter" },
{ sizeof(int), esd_proto_server_info, "server info" },
pa_client_free(c->client);
- if (c->sink_input)
- pa_sink_input_free(c->sink_input);
- if (c->source_output)
- pa_source_output_free(c->source_output);
+ if (c->sink_input) {
+ pa_sink_input_disconnect(c->sink_input);
+ pa_sink_input_unref(c->sink_input);
+ }
+
+ if (c->source_output) {
+ pa_source_output_disconnect(c->source_output);
+ pa_source_output_unref(c->source_output);
+ }
+
if (c->input_memblockq)
pa_memblockq_free(c->input_memblockq);
if (c->output_memblockq)
if (c->playback.current_memblock)
pa_memblock_unref(c->playback.current_memblock);
- free(c->read_data);
- free(c->write_data);
-
- pa_iochannel_free(c->io);
-
- if (c->fixed_source)
- c->protocol->core->mainloop->cancel_fixed(c->protocol->core->mainloop, c->fixed_source);
-
- free(c);
-}
-
-static struct pa_sink* get_output_sink(struct pa_protocol_esound *p) {
- struct pa_sink *s;
- assert(p);
-
- if (!(s = pa_idxset_get_by_index(p->core->sinks, p->sink_index)))
- s = pa_sink_get_default(p->core);
-
- p->sink_index = s ? s->index : PA_IDXSET_INVALID;
- return s;
-}
-
-static struct pa_source* get_input_source(struct pa_protocol_esound *p) {
- struct pa_source *s;
- assert(p);
+ pa_xfree(c->read_data);
+ pa_xfree(c->write_data);
- if (!(s = pa_idxset_get_by_index(p->core->sources, p->sink_index)))
- s = pa_source_get_default(p->core);
+ if (c->io)
+ pa_iochannel_free(c->io);
+
+ if (c->defer_event)
+ c->protocol->core->mainloop->defer_free(c->defer_event);
- p->source_index = s ? s->index : PA_IDXSET_INVALID;
- return s;
+ if (c->scache.memchunk.memblock)
+ pa_memblock_unref(c->scache.memchunk.memblock);
+ pa_xfree(c->scache.name);
+
+ pa_xfree(c);
}
static void* connection_write(struct connection *c, size_t length) {
size_t t, i;
assert(c);
- assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
- c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 1);
+ assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
t = c->write_data_length+length;
if (c->write_data_alloc < t)
- c->write_data = realloc(c->write_data, c->write_data_alloc = t);
+ c->write_data = pa_xrealloc(c->write_data, c->write_data_alloc = t);
assert(c->write_data);
i = c->write_data_length;
c->write_data_length += length;
- return c->write_data+i;
+ return (uint8_t*) c->write_data+i;
+}
+
+static void format_esd2native(int format, struct pa_sample_spec *ss) {
+ assert(ss);
+
+ ss->channels = ((format & ESD_MASK_CHAN) == ESD_STEREO) ? 2 : 1;
+ ss->format = ((format & ESD_MASK_BITS) == ESD_BITS16) ? PA_SAMPLE_S16NE : PA_SAMPLE_U8;
+}
+
+static int format_native2esd(struct pa_sample_spec *ss) {
+ int format = 0;
+
+ format = (ss->format == PA_SAMPLE_U8) ? ESD_BITS8 : ESD_BITS16;
+ format |= (ss->channels >= 2) ? ESD_STEREO : ESD_MONO;
+
+ return format;
}
/*** esound commands ***/
if (!c->authorized) {
if (memcmp(data, c->protocol->esd_key, ESD_KEY_LEN) != 0) {
- fprintf(stderr, __FILE__": kicked client with invalid authorization key.\n");
+ pa_log(__FILE__": kicked client with invalid authorization key.\n");
return -1;
}
c->authorized = 1;
}
- ekey = *(uint32_t*)(data+ESD_KEY_LEN);
+ ekey = *(uint32_t*)((uint8_t*) data+ESD_KEY_LEN);
if (ekey == ESD_ENDIAN_KEY)
c->swap_byte_order = 0;
else if (ekey == ESD_SWAP_ENDIAN_KEY)
c->swap_byte_order = 1;
else {
- fprintf(stderr, __FILE__": client sent invalid endian key\n");
+ pa_log(__FILE__": client sent invalid endian key\n");
return -1;
}
rate = maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
ss.rate = rate;
- ss.channels = ((format & ESD_MASK_CHAN) == ESD_STEREO) ? 2 : 1;
- ss.format = ((format & ESD_MASK_BITS) == ESD_BITS16) ? PA_SAMPLE_S16NE : PA_SAMPLE_U8;
+ format_esd2native(format, &ss);
if (!pa_sample_spec_valid(&ss))
return -1;
- if (!(sink = get_output_sink(c->protocol)))
+ if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
+ pa_log(__FILE__": No output sink\n");
return -1;
+ }
- strncpy(name, data + sizeof(int)*2, sizeof(name));
+ strncpy(name, (char*) data + sizeof(int)*2, sizeof(name));
name[sizeof(name)-1] = 0;
- pa_client_rename(c->client, name);
+ pa_client_set_name(c->client, name);
assert(!c->input_memblockq);
l = (size_t) (pa_bytes_per_second(&ss)*PLAYBACK_BUFFER_SECONDS);
- c->input_memblockq = pa_memblockq_new(l, 0, pa_sample_size(&ss), l/2, l/PLAYBACK_BUFFER_FRAGMENTS);
+ c->input_memblockq = pa_memblockq_new(l, 0, pa_frame_size(&ss), l/2, l/PLAYBACK_BUFFER_FRAGMENTS, c->protocol->core->memblock_stat);
assert(c->input_memblockq);
pa_iochannel_socket_set_rcvbuf(c->io, l/PLAYBACK_BUFFER_FRAGMENTS*2);
c->playback.fragment_size = l/10;
assert(!c->sink_input);
- c->sink_input = pa_sink_input_new(sink, name, &ss);
+ c->sink_input = pa_sink_input_new(sink, name, &ss, 0, -1);
assert(c->sink_input);
c->sink_input->owner = c->protocol->module;
rate = maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
ss.rate = rate;
- ss.channels = ((format & ESD_MASK_CHAN) == ESD_STEREO) ? 2 : 1;
- ss.format = ((format & ESD_MASK_BITS) == ESD_BITS16) ? PA_SAMPLE_S16NE : PA_SAMPLE_U8;
+ format_esd2native(format, &ss);
if (!pa_sample_spec_valid(&ss))
return -1;
if (request == ESD_PROTO_STREAM_MON) {
struct pa_sink* sink;
- if (!(sink = get_output_sink(c->protocol)))
+ if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1)))
return -1;
if (!(source = sink->monitor_source))
} else {
assert(request == ESD_PROTO_STREAM_REC);
- if (!(source = get_input_source(c->protocol)))
+ if (!(source = pa_namereg_get(c->protocol->core, c->protocol->source_name, PA_NAMEREG_SOURCE, 1)))
return -1;
}
- strncpy(name, data + sizeof(int)*2, sizeof(name));
+ strncpy(name, (char*) data + sizeof(int)*2, sizeof(name));
name[sizeof(name)-1] = 0;
- pa_client_rename(c->client, name);
+ pa_client_set_name(c->client, name);
assert(!c->output_memblockq);
l = (size_t) (pa_bytes_per_second(&ss)*RECORD_BUFFER_SECONDS);
- c->output_memblockq = pa_memblockq_new(l, 0, pa_sample_size(&ss), 0, 0);
+ c->output_memblockq = pa_memblockq_new(l, 0, pa_frame_size(&ss), 0, 0, c->protocol->core->memblock_stat);
assert(c->output_memblockq);
pa_iochannel_socket_set_sndbuf(c->io, l/RECORD_BUFFER_FRAGMENTS*2);
assert(!c->source_output);
- c->source_output = pa_source_output_new(source, name, &ss);
+ c->source_output = pa_source_output_new(source, name, &ss, -1);
assert(c->source_output);
c->source_output->owner = c->protocol->module;
c->source_output->client = c->client;
c->source_output->push = source_output_push_cb;
c->source_output->kill = source_output_kill_cb;
+ c->source_output->get_latency = source_output_get_latency_cb;
c->source_output->userdata = c;
c->state = ESD_STREAMING_DATA;
int latency, *lag;
assert(c && !data && length == 0);
- if (!(sink = get_output_sink(c->protocol)))
+ if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1)))
latency = 0;
else {
- float usec = pa_sink_get_latency(sink);
+ double usec = pa_sink_get_latency(sink);
usec += PLAYBACK_BUFFER_SECONDS*1000000; /* A better estimation would be a good idea! */
latency = (int) ((usec*44100)/1000000);
}
struct pa_sink *sink;
assert(c && data && length == sizeof(int));
- if ((sink = get_output_sink(c->protocol))) {
+ if ((sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) {
rate = sink->sample_spec.rate;
- format = (sink->sample_spec.format == PA_SAMPLE_U8) ? ESD_BITS8 : ESD_BITS16;
- format |= (sink->sample_spec.channels >= 2) ? ESD_STEREO : ESD_MONO;
+ format = format_native2esd(&sink->sample_spec);
}
response = connection_write(c, sizeof(int)*3);
}
static int esd_proto_all_info(struct connection *c, esd_proto_t request, const void *data, size_t length) {
- void *response;
+ uint8_t *response;
size_t t, k, s;
struct connection *conn;
size_t index = PA_IDXSET_INVALID;
+ unsigned nsamples;
assert(c && data && length == sizeof(int));
if (esd_proto_server_info(c, request, data, length) < 0)
k = sizeof(int)*5+ESD_NAME_MAX;
s = sizeof(int)*6+ESD_NAME_MAX;
- response = connection_write(c, (t = s+k*(c->protocol->n_player+1)));
+ nsamples = c->protocol->core->scache ? pa_idxset_ncontents(c->protocol->core->scache) : 0;
+ response = connection_write(c, (t = s*(nsamples+1) + k*(c->protocol->n_player+1)));
assert(k);
for (conn = pa_idxset_first(c->protocol->connections, &index); conn; conn = pa_idxset_next(c->protocol->connections, &index)) {
continue;
assert(t >= s+k+k);
-
+
if (conn->sink_input) {
rate = conn->sink_input->sample_spec.rate;
volume = (conn->sink_input->volume*0xFF)/0x100;
- format = (conn->sink_input->sample_spec.format == PA_SAMPLE_U8) ? ESD_BITS8 : ESD_BITS16;
- format |= (conn->sink_input->sample_spec.channels >= 2) ? ESD_STEREO : ESD_MONO;
+ format = format_native2esd(&conn->sink_input->sample_spec);
}
/* id */
- *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) conn->index);
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) (conn->index+1));
response += sizeof(int);
/* name */
assert(conn->client);
- strncpy(response, conn->client->name, ESD_NAME_MAX);
+ strncpy((char*) response, conn->client->name, ESD_NAME_MAX);
response += ESD_NAME_MAX;
/* rate */
t-= k;
}
- assert(t == s+k);
- memset(response, 0, t);
+ assert(t == s*(nsamples+1)+k);
+ memset(response, 0, k);
+ response += k;
+ t -= k;
+
+ if (nsamples) {
+ struct pa_scache_entry *ce;
+
+ index = PA_IDXSET_INVALID;
+ for (ce = pa_idxset_first(c->protocol->core->scache, &index); ce; ce = pa_idxset_next(c->protocol->core->scache, &index)) {
+ assert(t >= s*2);
+
+ /* id */
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) (ce->index+1));
+ response += sizeof(int);
+
+ /* name */
+ if (strncmp(ce->name, SCACHE_PREFIX, sizeof(SCACHE_PREFIX)-1) == 0)
+ strncpy((char*) response, ce->name+sizeof(SCACHE_PREFIX)-1, ESD_NAME_MAX);
+ else
+ snprintf((char*) response, ESD_NAME_MAX, "native.%s", ce->name);
+ response += ESD_NAME_MAX;
+
+ /* rate */
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, ce->sample_spec.rate);
+ response += sizeof(int);
+
+ /* left */
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (ce->volume*0xFF)/0x100);
+ response += sizeof(int);
+
+ /*right*/
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (ce->volume*0xFF)/0x100);
+ response += sizeof(int);
+
+ /*format*/
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, format_native2esd(&ce->sample_spec));
+ response += sizeof(int);
+
+ /*length*/
+ *((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) ce->memchunk.length);
+ response += sizeof(int);
+
+ t -= s;
+ }
+ }
+
+ assert(t == s);
+ memset(response, 0, s);
+
return 0;
}
struct connection *conn;
assert(c && data && length == sizeof(int)*3);
- index = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *(int*)data);
+ index = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *(int*)data)-1;
volume = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
volume = (volume*0x100)/0xFF;
return 0;
}
+static int esd_proto_sample_cache(struct connection *c, esd_proto_t request, const void *data, size_t length) {
+ struct pa_sample_spec ss;
+ int format, rate;
+ size_t sc_length;
+ uint32_t index;
+ int *ok;
+ char name[ESD_NAME_MAX+sizeof(SCACHE_PREFIX)-1];
+ assert(c && data && length == (ESD_NAME_MAX+3*sizeof(int)));
+
+ format = maybe_swap_endian_32(c->swap_byte_order, *(int*)data);
+ rate = maybe_swap_endian_32(c->swap_byte_order, *((int*)data + 1));
+
+ ss.rate = rate;
+ format_esd2native(format, &ss);
+
+ sc_length = (size_t) maybe_swap_endian_32(c->swap_byte_order, (*((int*)data + 2)));
+
+ if (sc_length >= MAX_CACHE_SAMPLE_SIZE)
+ return -1;
+
+ strcpy(name, SCACHE_PREFIX);
+ strncpy(name+sizeof(SCACHE_PREFIX)-1, (char*) data+3*sizeof(int), ESD_NAME_MAX);
+ name[sizeof(name)-1] = 0;
+
+ assert(!c->scache.memchunk.memblock);
+ c->scache.memchunk.memblock = pa_memblock_new(sc_length, c->protocol->core->memblock_stat);
+ c->scache.memchunk.index = 0;
+ c->scache.memchunk.length = sc_length;
+ c->scache.sample_spec = ss;
+ assert(!c->scache.name);
+ c->scache.name = pa_xstrdup(name);
+
+ c->state = ESD_CACHING_SAMPLE;
+
+ pa_scache_add_item(c->protocol->core, c->scache.name, NULL, NULL, &index);
+
+ ok = connection_write(c, sizeof(int));
+ assert(ok);
+
+ *ok = index+1;
+
+ return 0;
+}
+
+static int esd_proto_sample_get_id(struct connection *c, esd_proto_t request, const void *data, size_t length) {
+ int *ok;
+ uint32_t index;
+ char name[ESD_NAME_MAX+sizeof(SCACHE_PREFIX)-1];
+ assert(c && data && length == ESD_NAME_MAX);
+
+ ok = connection_write(c, sizeof(int));
+ assert(ok);
+
+ *ok = -1;
+
+ strcpy(name, SCACHE_PREFIX);
+ strncpy(name+sizeof(SCACHE_PREFIX)-1, data, ESD_NAME_MAX);
+ name[sizeof(name)-1] = 0;
+
+ if ((index = pa_scache_get_id_by_name(c->protocol->core, name)) != PA_IDXSET_INVALID)
+ *ok = (int) index +1;
+
+ return 0;
+}
+
+static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t request, const void *data, size_t length) {
+ int *ok;
+ const char *name;
+ uint32_t index;
+ assert(c && data && length == sizeof(int));
+
+ index = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *(int*)data)-1;
+
+ ok = connection_write(c, sizeof(int));
+ assert(ok);
+
+ *ok = 0;
+
+ if ((name = pa_scache_get_name_by_id(c->protocol->core, index))) {
+ if (request == ESD_PROTO_SAMPLE_PLAY) {
+ struct pa_sink *sink;
+
+ if ((sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1)))
+ if (pa_scache_play_item(c->protocol->core, name, sink, PA_VOLUME_NORM) >= 0)
+ *ok = (int) index+1;
+ } else {
+ assert(request == ESD_PROTO_SAMPLE_FREE);
+
+ if (pa_scache_remove_item(c->protocol->core, name) >= 0)
+ *ok = (int) index+1;
+ }
+ }
+
+ return 0;
+}
+
+static int esd_proto_standby_or_resume(struct connection *c, esd_proto_t request, const void *data, size_t length) {
+ int *ok;
+ ok = connection_write(c, sizeof(int)*2);
+ assert(ok);
+ ok[0] = 1;
+ ok[1] = 1;
+ return 0;
+}
+
/*** client callbacks ***/
static void client_kill_cb(struct pa_client *c) {
static int do_read(struct connection *c) {
assert(c && c->io);
+/* pa_log("READ\n"); */
+
if (c->state == ESD_NEXT_REQUEST) {
ssize_t r;
assert(c->read_data_length < sizeof(c->request));
- if ((r = pa_iochannel_read(c->io, ((void*) &c->request) + c->read_data_length, sizeof(c->request) - c->read_data_length)) <= 0) {
- fprintf(stderr, "protocol-esound.c: read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if ((r = pa_iochannel_read(c->io, ((uint8_t*) &c->request) + c->read_data_length, sizeof(c->request) - c->read_data_length)) <= 0) {
+ pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
return -1;
}
c->request = swap_endian_32(c->request);
if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) {
- fprintf(stderr, "protocol-esound.c: recieved invalid request.\n");
+ pa_log(__FILE__": recieved invalid request.\n");
return -1;
}
handler = proto_map+c->request;
+/* pa_log(__FILE__": executing request #%u\n", c->request); */
+
if (!handler->proc) {
- fprintf(stderr, "protocol-sound.c: recieved unimplemented request.\n");
+ pa_log(__FILE__": recieved unimplemented request #%u.\n", c->request);
return -1;
}
} else {
if (c->read_data_alloc < handler->data_length)
- c->read_data = realloc(c->read_data, c->read_data_alloc = handler->data_length);
+ c->read_data = pa_xrealloc(c->read_data, c->read_data_alloc = handler->data_length);
assert(c->read_data);
c->state = ESD_NEEDS_REQDATA;
assert(c->read_data && c->read_data_length < handler->data_length);
- if ((r = pa_iochannel_read(c->io, c->read_data + c->read_data_length, handler->data_length - c->read_data_length)) <= 0) {
- fprintf(stderr, "protocol-esound.c: read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if ((r = pa_iochannel_read(c->io, (uint8_t*) c->read_data + c->read_data_length, handler->data_length - c->read_data_length)) <= 0) {
+ pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
return -1;
}
if (handler->proc(c, c->request, c->read_data, l) < 0)
return -1;
}
+ } else if (c->state == ESD_CACHING_SAMPLE) {
+ ssize_t r;
+
+ assert(c->scache.memchunk.memblock && c->scache.name && c->scache.memchunk.index < c->scache.memchunk.length);
+
+ if ((r = pa_iochannel_read(c->io, (uint8_t*) c->scache.memchunk.memblock->data+c->scache.memchunk.index, c->scache.memchunk.length-c->scache.memchunk.index)) <= 0) {
+ pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ return -1;
+ }
+
+ c->scache.memchunk.index += r;
+ assert(c->scache.memchunk.index <= c->scache.memchunk.length);
+
+ if (c->scache.memchunk.index == c->scache.memchunk.length) {
+ uint32_t index;
+ int *ok;
+
+ c->scache.memchunk.index = 0;
+ pa_scache_add_item(c->protocol->core, c->scache.name, &c->scache.sample_spec, &c->scache.memchunk, &index);
+
+ pa_memblock_unref(c->scache.memchunk.memblock);
+ c->scache.memchunk.memblock = NULL;
+ c->scache.memchunk.index = c->scache.memchunk.length = 0;
+
+ pa_xfree(c->scache.name);
+ c->scache.name = NULL;
+
+ c->state = ESD_NEXT_REQUEST;
+
+ ok = connection_write(c, sizeof(int));
+ assert(ok);
+ *ok = index+1;
+ }
+
} else if (c->state == ESD_STREAMING_DATA && c->sink_input) {
struct pa_memchunk chunk;
ssize_t r;
assert(c->input_memblockq);
+/* pa_log("STREAMING_DATA\n"); */
+
if (!(l = pa_memblockq_missing(c->input_memblockq)))
return 0;
}
if (!c->playback.current_memblock) {
- c->playback.current_memblock = pa_memblock_new(c->playback.fragment_size*2);
+ c->playback.current_memblock = pa_memblock_new(c->playback.fragment_size*2, c->protocol->core->memblock_stat);
assert(c->playback.current_memblock && c->playback.current_memblock->length >= l);
c->playback.memblock_index = 0;
}
- if ((r = pa_iochannel_read(c->io, c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) {
- fprintf(stderr, __FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
+ if ((r = pa_iochannel_read(c->io, (uint8_t*) c->playback.current_memblock->data+c->playback.memblock_index, l)) <= 0) {
+ pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
return -1;
}
+
+/* pa_log(__FILE__": read %u\n", r); */
chunk.memblock = c->playback.current_memblock;
chunk.index = c->playback.memblock_index;
pa_memblockq_push_align(c->input_memblockq, &chunk, 0);
assert(c->sink_input);
pa_sink_notify(c->sink_input->sink);
-
}
return 0;
static int do_write(struct connection *c) {
assert(c && c->io);
+/* pa_log("WRITE\n"); */
+
if (c->write_data_length) {
ssize_t r;
assert(c->write_data_index < c->write_data_length);
- if ((r = pa_iochannel_write(c->io, c->write_data+c->write_data_index, c->write_data_length-c->write_data_index)) < 0) {
- fprintf(stderr, __FILE__": write() failed: %s\n", strerror(errno));
+ if ((r = pa_iochannel_write(c->io, (uint8_t*) c->write_data+c->write_data_index, c->write_data_length-c->write_data_index)) < 0) {
+ pa_log(__FILE__": write() failed: %s\n", strerror(errno));
return -1;
}
assert(chunk.memblock && chunk.length);
- if ((r = pa_iochannel_write(c->io, chunk.memblock->data+chunk.index, chunk.length)) < 0) {
+ if ((r = pa_iochannel_write(c->io, (uint8_t*) chunk.memblock->data+chunk.index, chunk.length)) < 0) {
pa_memblock_unref(chunk.memblock);
- fprintf(stderr, __FILE__": write(): %s\n", strerror(errno));
+ pa_log(__FILE__": write(): %s\n", strerror(errno));
return -1;
}
- pa_memblockq_drop(c->output_memblockq, r);
+ pa_memblockq_drop(c->output_memblockq, &chunk, r);
pa_memblock_unref(chunk.memblock);
}
static void do_work(struct connection *c) {
assert(c);
- assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
- c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 0);
+ assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
- if (pa_iochannel_is_hungup(c->io))
- goto fail;
-
- if (pa_iochannel_is_writable(c->io))
- if (do_write(c) < 0)
- goto fail;
+/* pa_log("DOWORK\n"); */
+
+ if (c->dead || !c->io)
+ return;
if (pa_iochannel_is_readable(c->io))
if (do_read(c) < 0)
goto fail;
-
+
+ if (pa_iochannel_is_writable(c->io))
+ if (do_write(c) < 0)
+ goto fail;
+
return;
fail:
- connection_free(c);
+
+ if (c->state == ESD_STREAMING_DATA && c->sink_input) {
+ c->dead = 1;
+ pa_memblockq_prebuf_disable(c->input_memblockq);
+
+ pa_iochannel_free(c->io);
+ c->io = NULL;
+
+ } else
+ connection_free(c);
}
static void io_callback(struct pa_iochannel*io, void *userdata) {
struct connection *c = userdata;
assert(io && c && c->io == io);
+/* pa_log("IO\n"); */
+
do_work(c);
}
-/*** fixed callback ***/
+/*** defer callback ***/
-static void fixed_callback(struct pa_mainloop_api*a, void *id, void *userdata) {
+static void defer_callback(struct pa_mainloop_api*a, struct pa_defer_event *e, void *userdata) {
struct connection *c = userdata;
- assert(a && c && c->fixed_source == id);
+ assert(a && c && c->defer_event == e);
+/* pa_log("DEFER\n"); */
+
do_work(c);
}
assert(i && i->userdata && chunk);
c = i->userdata;
- if (pa_memblockq_peek(c->input_memblockq, chunk) < 0)
+ if (pa_memblockq_peek(c->input_memblockq, chunk) < 0) {
+
+ if (c->dead)
+ connection_free(c);
+
return -1;
+ }
return 0;
}
-static void sink_input_drop_cb(struct pa_sink_input *i, size_t length) {
+static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk *chunk, size_t length) {
struct connection*c = i->userdata;
assert(i && c && length);
- pa_memblockq_drop(c->input_memblockq, length);
+/* pa_log("DROP\n"); */
+
+ pa_memblockq_drop(c->input_memblockq, chunk, length);
/* do something */
- assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
- c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 1);
+ assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+
+ if (!c->dead)
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
+
+/* assert(pa_memblockq_get_length(c->input_memblockq) > 2048); */
}
static void sink_input_kill_cb(struct pa_sink_input *i) {
connection_free((struct connection *) i->userdata);
}
-
-static uint32_t sink_input_get_latency_cb(struct pa_sink_input *i) {
+static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i) {
struct connection*c = i->userdata;
assert(i && c);
- return pa_samples_usec(pa_memblockq_get_length(c->input_memblockq), &c->sink_input->sample_spec);
+ return pa_bytes_to_usec(pa_memblockq_get_length(c->input_memblockq), &c->sink_input->sample_spec);
}
/*** source_output callbacks ***/
pa_memblockq_push(c->output_memblockq, chunk, 0);
/* do something */
- assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->enable_fixed);
- c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 1);
+ assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
+
+ if (!c->dead)
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 1);
}
static void source_output_kill_cb(struct pa_source_output *o) {
connection_free((struct connection *) o->userdata);
}
+static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o) {
+ struct connection*c = o->userdata;
+ assert(o && c);
+ return pa_bytes_to_usec(pa_memblockq_get_length(c->output_memblockq), &c->source_output->sample_spec);
+}
+
/*** socket server callback ***/
static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata) {
char cname[256];
assert(s && io && userdata);
- c = malloc(sizeof(struct connection));
- assert(c);
+ c = pa_xmalloc(sizeof(struct connection));
c->protocol = userdata;
c->io = io;
pa_iochannel_set_callback(c->io, io_callback, c);
c->authorized = c->protocol->public;
c->swap_byte_order = 0;
+ c->dead = 0;
c->read_data_length = 0;
- c->read_data = malloc(c->read_data_alloc = proto_map[ESD_PROTO_CONNECT].data_length);
- assert(c->read_data);
+ c->read_data = pa_xmalloc(c->read_data_alloc = proto_map[ESD_PROTO_CONNECT].data_length);
c->write_data_length = c->write_data_index = c->write_data_alloc = 0;
c->write_data = NULL;
c->playback.memblock_index = 0;
c->playback.fragment_size = 0;
- c->fixed_source = c->protocol->core->mainloop->source_fixed(c->protocol->core->mainloop, fixed_callback, c);
- assert(c->fixed_source);
- c->protocol->core->mainloop->enable_fixed(c->protocol->core->mainloop, c->fixed_source, 0);
+ c->scache.memchunk.length = c->scache.memchunk.index = 0;
+ c->scache.memchunk.memblock = NULL;
+ c->scache.name = NULL;
+ c->defer_event = c->protocol->core->mainloop->defer_new(c->protocol->core->mainloop, defer_callback, c);
+ assert(c->defer_event);
+ c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
+
pa_idxset_put(c->protocol->connections, c, &c->index);
}
/*** entry points ***/
struct pa_protocol_esound* pa_protocol_esound_new(struct pa_core*core, struct pa_socket_server *server, struct pa_module *m, struct pa_modargs *ma) {
- uint32_t source_index, sink_index;
struct pa_protocol_esound *p;
+ int public;
assert(core && server && ma);
- if (pa_modargs_get_source_index(ma, core, &source_index) < 0) {
- fprintf(stderr, __FILE__": source does not exist.\n");
- return NULL;
- }
+ p = pa_xmalloc(sizeof(struct pa_protocol_esound));
- if (pa_modargs_get_sink_index(ma, core, &sink_index) < 0) {
- fprintf(stderr, __FILE__": sink does not exist.\n");
+ if (pa_modargs_get_value_boolean(ma, "public", &public) < 0) {
+ pa_log(__FILE__": public= expects a boolean argument.\n");
return NULL;
}
- p = malloc(sizeof(struct pa_protocol_esound));
- assert(p);
if (pa_authkey_load_auto(pa_modargs_get_value(ma, "cookie", DEFAULT_COOKIE_FILE), p->esd_key, sizeof(p->esd_key)) < 0) {
- free(p);
+ pa_xfree(p);
return NULL;
}
p->module = m;
- p->public = 0;
+ p->public = public;
p->server = server;
pa_socket_server_set_callback(p->server, on_connection, p);
p->core = core;
p->connections = pa_idxset_new(NULL, NULL);
assert(p->connections);
- p->sink_index = sink_index;
- p->source_index = source_index;
+
+ p->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
+ p->source_name = pa_xstrdup(pa_modargs_get_value(ma, "source", NULL));
p->n_player = 0;
return p;
connection_free(c);
pa_idxset_free(p->connections, NULL, NULL);
- pa_socket_server_free(p->server);
- free(p);
+ pa_socket_server_unref(p->server);
+ pa_xfree(p);
}