size_t bytes_per_frame;
};
+struct writer_node {
+ struct writer *writer;
+ void *private_data;
+ int chunk_bytes;
+};
+
+struct writer {
+ int (*open)(struct writer_node *);
+ int (*write)(char *data, size_t nbytes, struct writer_node *);
+ void (*close)(struct writer_node *);
+ void (*shutdown)(struct writer_node *);
+};
+
+struct writer_node_group {
+ unsigned num_writers;
+ struct writer_node *writer_nodes;
+ int *written;
+ size_t max_chunk_bytes;
+ int eof;
+};
+
+
+#define FOR_EACH_WRITER_NODE(i, wng) for (i = 0; i < (wng)->num_writers; i++)
+
+#define NUM_WRITERS 1
+static struct writer writers[NUM_WRITERS];
+#define FOR_EACH_WRITER(i) for (i = 0; i < NUM_WRITERS, i++)
+
+
static unsigned char *audiobuf;
static struct timeval *start_time;
static struct gengetopt_args_info conf;
INIT_PLAY_ERRLISTS;
-void para_log(__a_unused int ll, const char* fmt,...)
+void para_log(int ll, const char* fmt,...)
{
va_list argp;
+ if (ll < conf.loglevel_arg)
+ return;
va_start(argp, fmt);
vfprintf(stderr, fmt, argp);
va_end(argp);
*
* Install PCM software and hardware configuration. Exit on errors.
*/
-static int alsa_init(void **private_data)
+static int alsa_open(struct writer_node *w)
{
snd_pcm_hw_params_t *hwparams;
snd_pcm_sw_params_t *swparams;
snd_output_t *log;
snd_pcm_uframes_t period_size;
struct private_alsa_data *pad = para_malloc(sizeof(struct private_alsa_data));
- *private_data = pad;
+ w->private_data = pad;
snd_pcm_info_alloca(&info);
if (snd_output_stdio_attach(&log, stderr, 0) < 0)
return -E_HW_PARAMS;
snd_pcm_hw_params_get_period_size(hwparams, &period_size, 0);
snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
- PARA_DEBUG_LOG("buffer size: %lu, period_size: %lu\n", buffer_size, period_size);
+ PARA_DEBUG_LOG("buffer size: %lu, period_size: %lu\n", buffer_size,
+ period_size);
if (period_size == buffer_size)
return -E_BAD_PERIOD;
snd_pcm_sw_params_current(pad->handle, swparams);
*
* \return Number of bytes written, -E_ALSA_WRITE on errors.
*/
-static int alsa_write(u_char *data, size_t nbytes, void *private_data)
+static int alsa_write(char *data, size_t nbytes, struct writer_node *wn)
{
- struct private_alsa_data *pad = private_data;
+ struct private_alsa_data *pad = wn->private_data;
size_t frames = nbytes / pad->bytes_per_frame;
+ unsigned char *d = data;
snd_pcm_sframes_t r, result = 0;
while (frames > 0) {
/* write interleaved frames */
- r = snd_pcm_writei(pad->handle, data, frames);
+ r = snd_pcm_writei(pad->handle, d, frames);
if (r < 0)
PARA_ERROR_LOG("write error: %s\n", snd_strerror(r));
if (r == -EAGAIN || (r >= 0 && r < frames))
if (r > 0) {
result += r;
frames -= r;
- data += r * pad->bytes_per_frame;
+ d += r * pad->bytes_per_frame;
}
}
return result * pad->bytes_per_frame;
}
-static void alsa_shutdown(void *private_data)
+static void alsa_close(struct writer_node *wn)
{
- struct private_alsa_data *pad = private_data;
+ struct private_alsa_data *pad = wn->private_data;
snd_pcm_drain(pad->handle);
snd_pcm_close(pad->handle);
snd_config_update_free_global();
free(pad);
}
+void alsa_writer_init(struct writer *w)
+{
+ w->open = alsa_open;
+ w->write = alsa_write;
+ w->close = alsa_close;
+ w->shutdown = NULL; /* nothing to do */
+}
+
+
/**
* check if current time is later than start_time
* \param diff pointer to write remaining time to
while (start_time_in_future(delay));
}
+static int read_stdin(char *buf, size_t bytes_to_load, size_t *loaded)
+{
+ ssize_t ret;
+
+ while (*loaded < bytes_to_load) {
+ ret = read(STDIN_FILENO, buf + *loaded, bytes_to_load - *loaded);
+ if (ret <= 0) {
+ if (ret < 0)
+ ret = -E_READ_STDIN;
+ return ret;
+ }
+ *loaded += ret;
+ }
+ return 1;
+}
+
+int wng_write(struct writer_node_group *g, char *buf, size_t *loaded)
+{
+ int ret, i, need_more_writes = 1;
+ size_t min_written = 0;
+
+ while (need_more_writes) {
+ need_more_writes = 0;
+ FOR_EACH_WRITER_NODE(i, g) {
+ size_t w = g->written[i];
+ unsigned char *p = buf + w;
+ int bytes_to_write;
+ struct writer_node *wn = &g->writer_nodes[i];
+ if (!i)
+ min_written = w;
+ else
+ min_written = PARA_MIN(min_written, w);
+ if (w == *loaded)
+ continue;
+ if (!g->eof && (*loaded < wn->chunk_bytes + w))
+ continue;
+ bytes_to_write = PARA_MIN(wn->chunk_bytes,
+ *loaded - w);
+ ret = wn->writer->write(p, bytes_to_write, wn);
+ if (ret < 0)
+ goto out;
+ if (ret != bytes_to_write)
+ PARA_WARNING_LOG("short write: %d/%d\n", ret,
+ bytes_to_write);
+ g->written[i] += ret;
+ need_more_writes = 1;
+ }
+ }
+ *loaded -= min_written;
+ ret = 0;
+ if (g->eof)
+ goto out;
+ if (*loaded)
+ memmove(buf, buf + min_written, *loaded);
+ FOR_EACH_WRITER_NODE(i, g)
+ g->written[i] -= min_written;
+ ret = 1;
+out:
+ return ret;
+}
+
+int wng_open(struct writer_node_group *g)
+{
+ int i, ret = 1;
+
+ FOR_EACH_WRITER_NODE(i, g) {
+ struct writer_node *wn = &g->writer_nodes[i];
+ ret = wn->writer->open(wn);
+ if (ret < 0)
+ goto out;
+ wn->chunk_bytes = ret;
+ g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
+ }
+out:
+ return ret;
+}
+
+void wng_close(struct writer_node_group *g)
+{
+ int i;
+
+ FOR_EACH_WRITER_NODE(i, g) {
+ struct writer_node *wn = &g->writer_nodes[i];
+ wn->writer->close(wn);
+ }
+}
+
/**
* play raw pcm data
* \param loaded number of bytes already loaded
*
* \return positive on success, negative on errors.
*/
-static int play_pcm(size_t loaded)
+static int pcm_write(struct writer_node_group *wng, size_t loaded)
{
- size_t bufsize, written = 0, prebuf_size;
- unsigned char *p;
+ size_t bufsize, prebuf_size, bytes_to_load;
struct timeval delay;
- void *private_data;
- int chunk_bytes, ret = alsa_init(&private_data);
+ int ret, not_yet_started = 1;
+ ret = wng_open(wng);
if (ret < 0)
goto out;
- chunk_bytes = ret;
- bufsize = (conf.bufsize_arg * 1024 / chunk_bytes) * chunk_bytes;
+ PARA_INFO_LOG("max chunk_bytes: %d\n", wng->max_chunk_bytes);
+ bufsize = (conf.bufsize_arg * 1024 / wng->max_chunk_bytes)
+ * wng->max_chunk_bytes;
audiobuf = para_realloc(audiobuf, bufsize);
prebuf_size = conf.prebuffer_arg * bufsize / 100;
-again:
- if (!written) {
- if (loaded < prebuf_size)
- goto read;
- if (start_time && start_time_in_future(&delay)) {
- do_initial_delay(&delay);
- start_time = NULL;
- }
- }
- p = audiobuf;
- while (loaded >= chunk_bytes) {
- ret = alsa_write(p, chunk_bytes, private_data);
- if (ret < 0)
- goto out;
- p += ret;
- written += ret;
- loaded -= ret;
- }
- if (loaded && p != audiobuf)
- memmove(audiobuf, p, loaded);
-read:
- ret = read(STDIN_FILENO, audiobuf + loaded, bufsize - loaded);
- if (ret < 0) {
- ret = -E_READ_STDIN;
+ bytes_to_load = PARA_MAX(prebuf_size, wng->max_chunk_bytes);
+ ret = read_stdin(audiobuf, bytes_to_load, &loaded);
+ if (ret <= 0 || loaded < bytes_to_load) {
+ if (ret >= 0)
+ ret = -E_PREMATURE_END;
goto out;
}
- if (ret) {
- loaded += ret;
- goto again;
- }
- ret = 1;
+ if (not_yet_started && start_time && start_time_in_future(&delay))
+ do_initial_delay(&delay);
+ not_yet_started = 0;
+again:
+ ret = wng_write(wng, audiobuf, &loaded);
+ if (ret <= 0)
+ goto out;
+ ret = -E_PLAY_OVERRUN;
+ if (loaded >= bufsize)
+ goto out;
+ bytes_to_load = PARA_MIN(wng->max_chunk_bytes, bufsize);
+ ret = read_stdin(audiobuf, bytes_to_load, &loaded);
+ if (ret < 0)
+ goto out;
+ if (!ret)
+ wng->eof = 1;
+ goto again;
out:
- alsa_shutdown(private_data);
+ wng_close(wng);
return ret;
}
+struct writer_node_group *wng_new(unsigned num_writers)
+{
+ struct writer_node_group *g = para_calloc(sizeof(struct writer_node_group));
+ g->num_writers = num_writers;
+ g->writer_nodes = para_calloc(num_writers
+ * sizeof(struct writer_node));
+ g->written = para_calloc(num_writers * sizeof(size_t));
+ return g;
+}
+
+void wng_destroy(struct writer_node_group *g)
+{
+ if (!g)
+ return;
+ free(g->written);
+ free(g->writer_nodes);
+ free(g);
+}
+
/**
* test if audio buffer contains a valid wave header
*
int main(int argc, char *argv[])
{
struct timeval tv;
- int ret;
+ int ret = -E_PLAY_SYNTAX;
+ struct writer_node_group *wng = NULL;
cmdline_parser(argc, argv, &conf);
+ if (conf.prebuffer_arg < 0 || conf.prebuffer_arg > 100)
+ goto out;
if (conf.start_time_given) {
- ret = -E_PLAY_SYNTAX;
if (sscanf(conf.start_time_arg, "%lu:%lu",
&tv.tv_sec, &tv.tv_usec) != 2)
goto out;
start_time = &tv;
}
+ /* call init for each supported writer */
+ alsa_writer_init(&writers[0]);
+
+ wng = wng_new(1);
+ wng->writer_nodes[0].writer = &writers[0]; /* alsa */
+
audiobuf = para_malloc(WAV_HEADER_LEN);
ret = read_wav_header();
if (ret < 0)
goto out;
- ret = play_pcm(check_wave());
+ ret = pcm_write(wng, check_wave());
out:
+ wng_destroy(wng);
free(audiobuf);
if (ret < 0)
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
projects / paraslash.git / blobdiff