Merge branch 'sched'

[paraslash.git] / aacdec.c

diff --git a/aacdec.c b/aacdec.c
index ce9c50da84efcd47b2c325743f5d1feb58d9b376..fe046b705e3d632304d9ba5ac4f5c6e77713f8e7 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -25,6 +25,7 @@
 #include "para.h"
 
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -45,22 +46,22 @@ struct private_aacdec_data {
 
        int initialized;
        int decoder_length;
-       long unsigned consumed_total;
-       long unsigned entry;
+       size_t consumed_total;
+       size_t entry;
 };
 
 static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 {
        struct private_aacdec_data *padd = fn->private_data;
-       struct filter_chain_info *fci = fn->fci;
-       int i, ret, skip;
+       struct filter_chain *fc = fn->fc;
+       int i, ret;
        unsigned char *p, *outbuffer;
        unsigned char *inbuf = (unsigned char*)input_buffer;
-       size_t consumed = 0;
+       size_t skip, consumed = 0;
 
        if (fn->loaded > fn->bufsize * 4 / 5)
                return 0;
-       if (len < 1000 && !*fci->eof)
+       if (len < 1000 && !*fc->input_eof)
                return 0;
 
        if (!padd->initialized) {
@@ -86,10 +87,10 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                                        &channels) < 0)
                                goto out;
                }
-               fci->samplerate = rate;
-               fci->channels = channels;
+               fc->samplerate = rate;
+               fc->channels = channels;
                PARA_INFO_LOG("rate: %u, channels: %d\n",
-                       fci->samplerate, fci->channels);
+                       fc->samplerate, fc->channels);
                padd->initialized = 1;
        }
        if (padd->decoder_length > 0) {
@@ -103,7 +104,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                        }
                        consumed += skip;
                        padd->entry = ret;
-                       PARA_INFO_LOG("entry: %lu\n", padd->entry);
+                       PARA_INFO_LOG("entry: %zu\n", padd->entry);
                }
                ret = len;
                if (padd->consumed_total + len < padd->entry)
@@ -121,7 +122,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                len - consumed);
        ret = -E_AAC_DECODE;
        if (padd->frame_info.error != 0) {
-               PARA_ERROR_LOG("frame_error: %d, consumed: %lu + %d + %lu\n",
+               PARA_ERROR_LOG("frame_error: %d, consumed: %zu + %zd + %lu\n",
                        padd->frame_info.error, padd->consumed_total,
                        consumed, padd->frame_info.bytesconsumed);
                PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(