fix writer node group eof

The old code did not set the eof flag at all. This patch fixes the problem
and contains also some loglevel and log message text improvements.

diff --git a/audiod.c b/audiod.c
index c2abfd5ab50a57abfb7d042c698b7eaca9efd546..36e826c02f5740b1294f4296eee43a6b2b110148 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -737,7 +737,6 @@ static void open_receiver(int format)
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[s->format], a->receiver->name, slot_num);
        rn->task.private_data = s->receiver_node;
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[s->format], a->receiver->name, slot_num);
        rn->task.private_data = s->receiver_node;

-       PARA_NOTICE_LOG("rn = %p\n", rn->task.private_data);

        rn->task.pre_select = a->receiver->pre_select;
        rn->task.post_select = a->receiver->post_select;
        rn->task.event_handler = rn_event_handler;
        rn->task.pre_select = a->receiver->pre_select;
        rn->task.post_select = a->receiver->post_select;
        rn->task.event_handler = rn_event_handler;

diff --git a/filter_chain.c b/filter_chain.c
index 5b87b087f6075770ab3a84a8bdbdac814afb99a4..17f67058df88c9e128b7afdb5a2a3c0f801e90ad 100644 (file)
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -69,8 +69,11 @@ static void close_callbacks(struct filter_node *fn)
 {
        struct filter_callback *fcb, *tmp;
 
 {
        struct filter_callback *fcb, *tmp;
 

-       list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node)
+       list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
+               PARA_INFO_LOG("closing %s filter callback\n",
+                       fn->filter->name);

                close_filter_callback(fcb);
                close_filter_callback(fcb);

+       }

 }
 
 static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
 }
 
 static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,


@@ -138,7 +141,7 @@ again:
                        *loaded -= t->ret;
                        conv += t->ret;
                        if (*loaded && t->ret) {
                        *loaded -= t->ret;
                        conv += t->ret;
                        if (*loaded && t->ret) {

-                               PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n",
+                               PARA_INFO_LOG("moving %zd bytes in input buffer for %s filter\n",

                                        *loaded,  fn->filter->name);
                                memmove(ib, ib + t->ret, *loaded);
                        }
                                        *loaded,  fn->filter->name);
                                memmove(ib, ib + t->ret, *loaded);
                        }


@@ -147,7 +150,7 @@ again:
                loaded = &fn->loaded;
        }
        conv_total += conv;
                loaded = &fn->loaded;
        }
        conv_total += conv;

-       PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,
+       PARA_INFO_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,

                *fc->output_eof, fc->eof, *fc->out_loaded, conv, conv_total);
        if (conv)
                goto again;
                *fc->output_eof, fc->eof, *fc->out_loaded, conv, conv_total);
        if (conv)
                goto again;


@@ -181,11 +184,10 @@ void close_filters(struct filter_chain *fc)
 
        if (!fc)
                return;
 
        if (!fc)
                return;

-       PARA_DEBUG_LOG("closing filter chain %p\n", fc);
+       PARA_NOTICE_LOG("closing filter chain %p\n", fc);

        list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
        list_for_each_entry_safe(fn, tmp, &fc->filters, node) {

-               PARA_NOTICE_LOG("closing %s filter callbacks (fc %p, fn %p)\n", fn->filter->name, fc, fn);

                close_callbacks(fn);
                close_callbacks(fn);

-               PARA_NOTICE_LOG("closing %s filter (fc %p, fn %p)\n", fn->filter->name, fc, fn);
+               PARA_INFO_LOG("closing %s filter\n", fn->filter->name);

                fn->filter->close(fn);
                list_del(&fn->node);
                free(fn);
                fn->filter->close(fn);
                list_del(&fn->node);
                free(fn);

diff --git a/mp3dec.c b/mp3dec.c
index dd7887d51f830409289f389ffa4bd5fd9f897717..f809daec441c1e5957c48171cdcd3eeb470977b0 100644 (file)
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -98,8 +98,8 @@ next_frame:
 out:
        if (pmd->stream.next_frame) { /* we still have some data */
                size_t off = pmd->stream.bufend - pmd->stream.next_frame;
 out:
        if (pmd->stream.next_frame) { /* we still have some data */
                size_t off = pmd->stream.bufend - pmd->stream.next_frame;

-               PARA_DEBUG_LOG("converted %zd, rate: %u, returning %zd\n", len - off,
-                       fn->fc->samplerate, copy - off);
+//             PARA_DEBUG_LOG("converted %zd, rate: %u, returning %zd\n", len - off,
+//                     fn->fc->samplerate, copy - off);

                return copy - off;
        }
        return copy;
                return copy - off;
        }
        return copy;

diff --git a/ortp_recv.c b/ortp_recv.c
index 99b53ad07e3106486fe314576c3a06eadd974b70..60fb6b0ef6c416c3d61ccbb04a773de7138fbfd7 100644 (file)
--- a/ortp_recv.c
+++ b/ortp_recv.c
@@ -106,7 +106,7 @@ static void ortp_recv_post_select(struct sched *s, struct task *t)
        char tmpbuf[CHUNK_SIZE + 3];
        unsigned chunk_time;
 
        char tmpbuf[CHUNK_SIZE + 3];
        unsigned chunk_time;
 

-//     PARA_DEBUG_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session);
+//     PARA_INFO_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session);

        t->ret = 1;
        if (pord->start.tv_sec)
                if (tv_diff(&s->now, &pord->next_chunk, NULL) < 0)
        t->ret = 1;
        if (pord->start.tv_sec)
                if (tv_diff(&s->now, &pord->next_chunk, NULL) < 0)

diff --git a/write_common.c b/write_common.c
index 7fb8d12337b6fdc28a1af741e5a0cd6a74f21ea4..cfdabe4821bc6af60a12b99f3c9c5ff0b03d60d5 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -45,9 +45,10 @@ static void wng_post_select(__a_unused struct sched *s, struct task *t)
                        min_written = PARA_MIN(min_written, t->ret);
        }
        *g->loaded -= min_written;
                        min_written = PARA_MIN(min_written, t->ret);
        }
        *g->loaded -= min_written;

-       if (!*g->loaded && *g->input_eof)
+       if (!*g->loaded && *g->input_eof) {
+               g->eof = 1;

                t->ret = -E_WNG_EOF;
                t->ret = -E_WNG_EOF;

-       else
+       } else

                t->ret = 1;
        if (*g->loaded && min_written)
                memmove(g->buf, g->buf + min_written, *g->loaded);
                t->ret = 1;
        if (*g->loaded && min_written)
                memmove(g->buf, g->buf + min_written, *g->loaded);


@@ -57,6 +58,7 @@ int wng_open(struct writer_node_group *g)
 {
        int i, ret = 1;
 
 {
        int i, ret = 1;
 

+       PARA_NOTICE_LOG("opening wng with %d writer(s)\n", g->num_writers);

        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
                ret = wn->writer->open(wn);
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
                ret = wn->writer->open(wn);


@@ -92,6 +94,7 @@ void wng_close(struct writer_node_group *g)
 {
        int i;
 
 {
        int i;
 

+       PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);

        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
                unregister_task(&wn->task);
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
                unregister_task(&wn->task);