Merge branch 't/bits_per_sample'

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 2dd68448b3b130172ba3417cb20eedcfc1fff262..1127fc1132b90d56169c34d732c9343e47e8fa43 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -100,7 +100,7 @@ next_buffer:
                return;
        btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, (char **)&inbuf);
-       len = PARA_MAX(len, (size_t)8192);
+       len = PARA_MIN(len, (size_t)8192);
        consumed = 0;
        iqs = btr_get_input_queue_size(btrn);
        if (!padd->initialized) {
@@ -174,7 +174,8 @@ next_buffer:
                        padd->frame_info.bytesconsumed);
                PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
                        padd->frame_info.error));
-               consumed++; /* catch 21 */
+               if (consumed < len)
+                       consumed++; /* catch 21 */
                goto success;
        }
        padd->error_count = 0;

diff --git a/alsa_write.c b/alsa_write.c
index dfa7a2e1a5ba068da9e457068e50eeccdf079ad3..7f8aae01c22a6b9fcc2a48712c490b6bde73b40e 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -258,6 +258,7 @@ again:
                if (ret < 0)
                        goto err;
                wn->min_iqs = pad->bytes_per_frame;
+               goto again;
        }
        frames = bytes / pad->bytes_per_frame;
        frames = snd_pcm_writei(pad->handle, data, frames);

diff --git a/buffer_tree.c b/buffer_tree.c
index 3a59f8b5e2e20fa20c94117dd31e2655101936cf..d92d9863e10e2b4081fba91a35b06233933a15cc 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -634,7 +634,7 @@ void btr_consume(struct btr_node *btrn, size_t numbytes)
                        numbytes -= br->btrb->size - br->consumed;
                        btr_drop_buffer_reference(br);
                }
-               assert(true);
+               assert(false);
        }
        /*
         * We have a wrap buffer, consume from it. If in total, i.e. including

diff --git a/send_common.c b/send_common.c
index 005583cf52bf425f67727df68600c1094a3c0ad8..33c56e7ab135b50a4c77242cb3534ec67d5d9608 100644 (file)
--- a/send_common.c
+++ b/send_common.c
@@ -261,6 +261,7 @@ void generic_com_off(struct sender_status *ss)
  * Accept a connection on the socket this server is listening on.
  *
  * \param ss The sender whose listening fd is ready for reading.
+ * \param rfds Passed to para_accept(),
  *
  * This must be called only if the socket fd of \a ss is ready for reading.  It
  * calls para_accept() to accept the connection and performs the following