client: Fix a memory leak in client_post_select().

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 252f323b3e59246f170d67091de04bdd531aea25..bac28cfdee77d5a9d48d343fc7f208111f437991 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -31,10 +31,6 @@
 struct private_oggdec_data {
        /** Describes an ogg vorbis file. */
        OggVorbis_File *vf;
-       /** The input buffer. */
-       char *inbuf;
-       /** The length of \a inbuf. */
-       size_t inbuf_len;
        /** The number of bytes consumed from the input buffer. */
        size_t converted;
        /** When to start producing output. */
@@ -45,28 +41,7 @@ struct private_oggdec_data {
        unsigned int samplerate;
 };
 
-static size_t cb_read_nobtr(void *buf, size_t size, size_t nmemb, void *datasource)
-{
-       struct filter_node *fn = datasource;
-       struct private_oggdec_data *pod = fn->private_data;
-       size_t ret, have = pod->inbuf_len - pod->converted;
-       char *p = pod->inbuf + pod->converted;
-
-//     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_error)
-                       return 0;
-               errno = EAGAIN;
-               return (size_t)-1;
-       }
-       ret = PARA_MIN(nmemb, have / size) * size;
-       memcpy(buf, p, ret);
-       pod->converted += ret;
-       return ret;
-}
-
-static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource)
+static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 {
        struct filter_node *fn = datasource;
        struct private_oggdec_data *pod = fn->private_data;
@@ -90,16 +65,6 @@ static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource
        return tmp;
 }
 
-static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
-{
-       struct filter_node *fn = datasource;
-
-       if (fn->btrn)
-               return cb_read_btr(buf, size, nmemb, datasource);
-       else
-               return cb_read_nobtr(buf, size, nmemb, datasource);
-}
-
 /*
  * Custom data seeking function.
  *
@@ -132,11 +97,8 @@ static void ogg_open(struct filter_node *fn)
 {
        struct private_oggdec_data *pod = para_calloc(
                sizeof(struct private_oggdec_data));
-       struct oggdec_filter_args_info *conf = fn->conf;
 
        fn->private_data = pod;
-       fn->bufsize = conf->bufsize_arg * 1024;
-       fn->buf = para_malloc(fn->bufsize);
        fn->min_iqs = 8000;
 }
 
@@ -149,9 +111,7 @@ static void ogg_close(struct filter_node *fn)
                free(pod->vf);
                pod->vf = NULL;
        } else
-               PARA_DEBUG_LOG("nothing to close in fc %p, pod = %p\n", pod->vf, pod);
-       free(fn->buf);
-       fn->buf = NULL;
+               PARA_DEBUG_LOG("nothing to close\n");
        free(fn->private_data);
        fn->private_data = NULL;
 }
@@ -293,78 +253,6 @@ out:
        }
 }
 
-static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
-{
-       ssize_t ret;
-       struct private_oggdec_data *pod = fn->private_data;
-       struct oggdec_filter_args_info *conf = fn->conf;
-       /* make the buffer known to the read callback cb_read() */
-       pod->inbuf = inbuffer;
-       pod->inbuf_len = len;
-       pod->converted = 0;
-
-       if (!pod->vf) {
-               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_EVERSION)
-                       return -E_OGGDEC_VERSION;
-               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 == 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;
-       }
-       return pod->converted;
-}
-
 static int oggdec_parse_config(int argc, char **argv, void **config)
 {
        int ret;
@@ -407,7 +295,6 @@ void oggdec_filter_init(struct filter *f)
        oggdec_cmdline_parser_init(&dummy);
        f->open = ogg_open;
        f->close = ogg_close;
-       f->convert = ogg_convert;
        f->pre_select = generic_filter_pre_select;
        f->post_select = ogg_post_select;
        f->parse_config = oggdec_parse_config;