Introduce filter_node->min_iqs.

[paraslash.git] / mp3dec_filter.c

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index dfec0c4c133591c81c8be1cece951a0ea2a8b48f..c3f21f126ad7911a67e82903bb0ac12cdb49c13e 100644 (file)
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -101,10 +101,9 @@ static void mp3dec_pre_select(struct sched *s, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
        size_t iqs = btr_get_input_queue_size(fn->btrn);
-       struct private_mp3dec_data *pmd = fn->private_data;
 
        t->error = 0;
-       if (iqs <= pmd->input_len_barrier)
+       if (iqs <= fn->min_iqs)
                return;
        if (btr_bytes_pending(fn->btrn) > MP3DEC_MAX_PENDING)
                return; /* FIXME, should use reasonable bound on timeout */
@@ -216,7 +215,7 @@ next_buffer:
        iqs = btr_get_input_queue_size(btrn);
        if (need_bad_data_delay(pmd, iqs))
                return;
-       ret = prepare_filter_node(btrn, pmd->input_len_barrier);
+       ret = prepare_filter_node(btrn, fn->min_iqs);
        if (ret < 0)
                goto err;
        if (ret == 0)
@@ -233,14 +232,14 @@ next_frame:
                                ret = -E_MP3DEC_EOF;
                                goto err;
                        }
-                       pmd->input_len_barrier += 100;
+                       fn->min_iqs += 100;
                        goto next_buffer;
                } else if (pmd->stream.error != MAD_ERROR_LOSTSYNC)
                        PARA_DEBUG_LOG("header decode: %s\n",
                                mad_stream_errorstr(&pmd->stream));
                goto next_buffer;
        }
-       pmd->input_len_barrier = 0;
+       fn->min_iqs = 0;
        pmd->samplerate = pmd->frame.header.samplerate;
        pmd->channels = MAD_NCHANNELS(&pmd->frame.header);
        ret = mad_frame_decode(&pmd->frame, &pmd->stream);