/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */
-#include "para.h"
+#include <regex.h>
+#include <vorbis/vorbisfile.h>
+#include "para.h"
#include "oggdec_filter.cmdline.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "filter.h"
#include "error.h"
#include "string.h"
-#include <vorbis/vorbisfile.h>
-
/** Determine byte sex. */
#ifdef WORDS_BIGENDIAN
#define ENDIAN 1
size_t inbuf_len;
/** The number of bytes consumed from the input buffer. */
size_t converted;
+ /** When to start producing output. */
+ struct timeval stream_start;
};
static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
pod->converted = 0;
if (!pod->vf) {
- int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
- if (len <ib && !*fn->fc->input_error) {
- PARA_DEBUG_LOG("initial input buffer %zd/%d, "
- "waiting for more data\n", len, ib);
+ if (*fn->fc->input_error < 0)
+ return *fn->fc->input_error;
+ if (!len)
return 0;
- }
pod->vf = para_malloc(sizeof(struct OggVorbis_File));
PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len);
ret = ov_open_callbacks(fn, pod->vf,
NULL, /* no initial buffer */
0, /* no initial bytes */
ovc); /* the ov_open_callbacks */
+ if (ret == OV_ENOTVORBIS || ret == OV_EBADHEADER) {
+ /* this might be due to the input buffer being too small */
+ int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
+ if (len < ib) {
+ PARA_INFO_LOG("initial input buffer %zd/%d, "
+ "waiting for more data\n", len, ib);
+ free(pod->vf);
+ pod->vf = NULL;
+ return 0;
+ }
+ return ret == OV_ENOTVORBIS?
+ -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
+ }
if (ret == OV_EREAD)
return -E_OGGDEC_READ;
- if (ret == OV_ENOTVORBIS)
- return -E_OGGDEC_NOTVORBIS;
if (ret == OV_EVERSION)
return -E_OGGDEC_VERSION;
- if (ret == OV_EBADHEADER)
- return -E_OGGDEC_BADHEADER;
if (ret < 0)
return -E_OGGDEC_FAULT;
fn->fc->channels = ov_info(pod->vf, 0)->channels;
fn->fc->samplerate = ov_info(pod->vf, 0)->rate;
PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
fn->fc->samplerate);
+ /* wait a bit to avoid buffer underruns */
+ tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
+ return pod->converted;
+ }
+ if (tv_diff(now, &pod->stream_start, NULL) < 0) {
+ PARA_DEBUG_LOG("initial delay..\n");
+ return 0;
}
while (fn->loaded < fn->bufsize) {
int length = fn->bufsize - fn->loaded;
long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
- if (read_ret == OV_HOLE || !read_ret)
+ if (read_ret == 0)
+ return pod->converted;
+ if (read_ret == OV_HOLE) {
+ if (!fn->loaded) {
+ PARA_INFO_LOG("hole, delaying playback\n");
+ tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
+ }
return pod->converted;
+ }
if (read_ret < 0)
return -E_OGGDEC_BADLINK;
fn->loaded += read_ret;
*/
void oggdec_filter_init(struct filter *f)
{
+ struct oggdec_filter_args_info dummy;
+
+ oggdec_cmdline_parser_init(&dummy);
f->open = ogg_open;
f->close = ogg_close;
f->convert = ogg_convert;
- f->print_help = oggdec_cmdline_parser_print_help;
f->parse_config = oggdec_parse_config;
+ f->help = (struct ggo_help) {
+ .short_help = oggdec_filter_args_info_help,
+ .detailed_help = oggdec_filter_args_info_detailed_help
+ };
}