Merge branch 'master' into next

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index babcd24c9a1e55cf95b1dcb6d340e5b5d490cb06..a8984a488421717b2173b94c4da3866aa6e2d766 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -11,7 +11,9 @@
  * senders.
  */
 
+#include <regex.h>
 #include <dirent.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -254,38 +256,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;
@@ -354,7 +357,12 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
                g->num_header_slices, data_slices
        );
        /* set group start */
-       tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp);
+       if (g->num != 0 && vsst->header_len != 0 && fc->first_stream_chunk == 0)
+               /* chunk #0 is the audio file header */
+               tv_scale(g->first_chunk - 1, chunk_tv, &tmp);
+       else
+               tv_scale(g->first_chunk - fc->first_stream_chunk,
+                       chunk_tv, &tmp);
        tv_add(&fc->stream_start, &tmp, &g->start);
        return 1;
 }
@@ -493,8 +501,7 @@ static void compute_slice_timeout(struct timeval *timeout)
 static void set_eof_barrier(struct vss_task *vsst)
 {
        struct fec_client *fc;
-       struct timeval timeout = mmd->afd.afhi.eof_tv,
-               *chunk_tv = vss_chunk_time();
+       struct timeval timeout = {1, 0}, *chunk_tv = vss_chunk_time();
 
        if (!chunk_tv)
                goto out;
@@ -636,10 +643,6 @@ static void vss_eof(struct vss_task *vsst)
        mmd->afd.afhi.chunk_tv.tv_usec = 0;
        free(mmd->afd.afhi.chunk_table);
        mmd->afd.afhi.chunk_table = NULL;
-       free(mmd->afd.afhi.info_string);
-       mmd->afd.afhi.info_string = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
-               status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
-       make_empty_status_items(mmd->afd.verbose_ls_output);
        mmd->mtime = 0;
        mmd->size = 0;
        mmd->events++;
@@ -788,7 +791,6 @@ static void recv_afs_result(struct vss_task *vsst)
        if (passed_fd < 0)
                goto err;
        shmid = afs_data;
-       free(mmd->afd.afhi.info_string);
        ret = load_afd(shmid, &mmd->afd);
        if (ret < 0)
                goto err;
@@ -965,7 +967,6 @@ void init_vss_task(int afs_socket)
        free(hn);
        free(home);
        mmd->sender_cmd_data.cmd_num = -1;
-       make_empty_status_items(mmd->afd.verbose_ls_output);
        if (conf.autoplay_given) {
                struct timeval tmp;
                mmd->vss_status_flags |= VSS_PLAYING;