Merge branch 'maint'

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 02f04b4809e66864e78e0bde29b8cd0665c6984e..c158df7e4df7777f1f92468c3ef0f3a333756237 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -35,6 +35,8 @@ struct private_oggdec_data {
        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)
@@ -124,41 +126,60 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
        pod->converted = 0;
 
        if (!pod->vf) {
-               int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
                if (*fn->fc->input_error < 0)
                        return *fn->fc->input_error;
-               if (len < ib) {
-                       PARA_DEBUG_LOG("initial input buffer %zd/%d, "
-                               "waiting for more data\n", len, ib);
+               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;