Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Sun, 25 Oct 2009 16:47:50 +0000 (17:47 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 25 Oct 2009 16:47:50 +0000 (17:47 +0100)
udp_send.c
vss.c

index 7217c96..7d13f14 100644 (file)
@@ -179,9 +179,7 @@ static int udp_init_session(struct udp_target *ut)
        }
        add_close_on_fork_list(ut->fd);
        ut->cq = cq_new(UDP_CQ_BYTES);
-       PARA_NOTICE_LOG("sending to udp %s#%d using fec parms %d:%d:%d\n",
-               ut->host, ut->port , ut->fcp.max_slice_bytes,
-               ut->fcp.data_slices_per_group, ut->fcp.slices_per_group);
+       PARA_NOTICE_LOG("sending to udp %s#%d\n", ut->host, ut->port);
        return 1;
 }
 
diff --git a/vss.c b/vss.c
index aae601d..6db42bd 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -254,38 +254,39 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
        uint32_t max_data_size;
 
        assert(chunk_tv);
-       k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
        if (fc->first_stream_chunk < 0) {
-               uint32_t largest = afh_get_largest_chunk_size(&mmd->afd.afhi)
-                       + vsst->header_len;
-               uint8_t needed, want;
+               uint8_t hs, ds; /* needed header/data slices */
+               uint8_t rs = fc->fcp->slices_per_group
+                       - fc->fcp->data_slices_per_group; /* redundant slices */
+               int n;
 
-               ret = num_slices(largest, fc, &needed);
+               ret = num_slices(vsst->header_len, fc, &hs);
+               if (ret < 0)
+                       return ret;
+               ret = num_slices(afh_get_largest_chunk_size(&mmd->afd.afhi),
+                       fc, &ds);
+               if (ret < 0)
+                       return ret;
+               k = (int)hs + ds;
+               if (k > 255)
+                       return -E_BAD_CT;
+               if (k < fc->fcp->data_slices_per_group)
+                       k = fc->fcp->data_slices_per_group;
+               n = k + rs;
+               fc->num_extra_slices = k - fc->fcp->data_slices_per_group;
+               PARA_NOTICE_LOG("fec parms %d:%d:%d (%d extra slices)\n",
+                       slice_bytes, k, n, fc->num_extra_slices);
+               fec_free(fc->parms);
+               fc->src_data = para_realloc(fc->src_data, k * sizeof(char *));
+               ret = fec_new(k, n, &fc->parms);
                if (ret < 0)
                        return ret;
-               if (needed > fc->fcp->data_slices_per_group)
-                       PARA_WARNING_LOG("fec parms insufficient for this audio file\n");
-               want = PARA_MAX(needed, fc->fcp->data_slices_per_group);
-               if (want != k) {
-                       fec_free(fc->parms);
-                       fc->src_data = para_realloc(fc->src_data, want * sizeof(char *));
-                       ret = fec_new(want, want + fc->fcp->slices_per_group
-                               - fc->fcp->data_slices_per_group, &fc->parms);
-                       if (ret < 0)
-                               return ret;
-                       k = want;
-                       fc->num_extra_slices = 0;
-                       if (k > fc->fcp->data_slices_per_group) {
-                               fc->num_extra_slices = k - fc->fcp->data_slices_per_group;
-                               PARA_NOTICE_LOG("using %d extra slices\n",
-                                       fc->num_extra_slices);
-                       }
-               }
                fc->stream_start = *now;
                fc->first_stream_chunk = mmd->current_chunk;
                g->first_chunk = mmd->current_chunk;
                g->num = 0;
        } else {
+               k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
                /* use duration of the previous group for the timing of this group */
                set_slice_duration(fc, g);
                g->first_chunk += g->num_chunks;