#include "oggdec_filter.cmdline.h"
#include "list.h"
+#include "sched.h"
#include "filter.h"
#include "error.h"
#include "string.h"
size_t ret, have = pod->inbuf_len - pod->converted;
char *p = pod->inbuf + pod->converted;
- if (*fn->fci->eof)
- return 0;
// PARA_DEBUG_LOG("pod = %p\n", pod);
// PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
if (pod->inbuf_len < size) {
+ if (*fn->fc->input_eof)
+ return 0;
errno = EAGAIN;
return -1;
}
- ret = MIN(nmemb, have / size) * size;
+ ret = PARA_MIN(nmemb, have / size) * size;
memcpy(buf, p, ret);
pod->converted += ret;
return ret;
* Since we want the data source to be treated as unseekable at all
* times, the provided seek callback always returns -1 (failure).
*/
-static int cb_seek(__unused void *datasource, __unused ogg_int64_t offset,
- __unused int whence)
+static int cb_seek(__a_unused void *datasource, __a_unused ogg_int64_t offset,
+ __a_unused int whence)
{
return -1;
}
-static int cb_close(__unused void *datasource)
+static int cb_close(__a_unused void *datasource)
{
return 0;
}
if (!pod->vf) {
int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
- if (len <ib && !*fn->fci->eof && !fn->fci->error) {
- PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
- len, ib);
+ if (len <ib && !*fn->fc->input_eof) {
+ PARA_DEBUG_LOG("initial input buffer %zd/%d, "
+ "waiting for more data\n", len, ib);
return 0;
}
pod->vf = para_malloc(sizeof(struct OggVorbis_File));
return -E_OGGDEC_BADHEADER;
if (ret < 0)
return -E_OGGDEC_FAULT;
- fn->fci->channels = ov_info(pod->vf, 0)->channels;
- fn->fci->samplerate = ov_info(pod->vf, 0)->rate;
- PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fci->channels, fn->fci->samplerate);
+ 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);
}
again:
ret = ov_read(pod->vf, fn->buf + fn->loaded, fn->bufsize - fn->loaded,
if (ret < 0)
return -E_OGGDEC_BADLINK;
fn->loaded += ret;
- if (!*fn->fci->eof && !fn->fci->error && fn->loaded < fn->bufsize)
+ if (!*fn->fc->input_eof && fn->loaded < fn->bufsize)
goto again;
return pod->converted;
}