Merge branch 'master' into next

Conflicts:
	aft.c
	command.c

diff --combined mp3dec_filter.c
index aceee9ae686666583f5b6a3bfbbc515cbc4c6328,24123bc68c3b3080004a3c1013b8f177464686e5..bd2b4be6869f9a09329b1bdd90936324c406f8b1
--- 1/mp3dec_filter.c
--- 2/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@@ -6,9 -6,6 +6,9 @@@
  
  /** \file mp3dec_filter.c Paraslash's mp3 decoder. */
  
 +#include <mad.h>
 +#include <regex.h>
 +
  #include "para.h"
  #include "mp3dec_filter.cmdline.h"
  #include "list.h"
@@@ -16,12 -13,21 +16,20 @@@
  #include "ggo.h"
  #include "filter.h"
  #include "error.h"
 -#include <mad.h>
  #include "string.h"
  
  /** Convert a sample value from libmad to a signed short. */
  #define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
        (f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
  
+ /** State of the decoding process. */
+ enum mp3dec_flags {
+       /** Bad main_data_begin pointer encounterd. */
+       MP3DEC_FLAG_BAD_DATA = 1,
+       /** Some output has already been produced. */
+       MP3DEC_FLAG_DECODE_STARTED = 2,
+ };
+ 
  /** Data specific to the mp3dec filter. */
  struct private_mp3dec_data {
        /** Information on the current mp3 stream. */
@@@ -30,8 -36,55 +38,55 @@@
        struct mad_frame frame;
        /** Contains the PCM output. */
        struct mad_synth synth;
+       /** See \ref mp3dec_flags. */
+       unsigned flags;
+       /** Defer decoding until this time. */
+       struct timeval stream_start_barrier;
+       /** Wait until this many input bytes are available. */
+       size_t input_len_barrier;
  };
  
+ static int need_bad_data_delay(struct private_mp3dec_data *pmd,
+               size_t bytes_available)
+ {
+       if (!(pmd->flags & MP3DEC_FLAG_BAD_DATA))
+               return 0;
+       if (pmd->flags & MP3DEC_FLAG_DECODE_STARTED)
+               return 0;
+       if (bytes_available >= pmd->input_len_barrier)
+               return 0;
+       if (tv_diff(now, &pmd->stream_start_barrier, NULL) > 0)
+               return 0;
+       return 1;
+ }
+ 
+ /*
+  * Returns negative on serious errors, zero if the error should be ignored and
+  * positive on bad data pointer errors at stream start.
+  */
+ static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len)
+ {
+       if (!MAD_RECOVERABLE(pmd->stream.error)
+                       && pmd->stream.error != MAD_ERROR_BUFLEN) {
+               PARA_ERROR_LOG("%s\n", mad_stream_errorstr(&pmd->stream));
+               return -E_MAD_FRAME_DECODE;
+       }
+       PARA_DEBUG_LOG("%s\n", mad_stream_errorstr(&pmd->stream));
+       if (pmd->stream.error != MAD_ERROR_BADDATAPTR)
+               return 0;
+       if (pmd->flags & MP3DEC_FLAG_DECODE_STARTED)
+               return 0;
+       /*
+        * Bad data pointer at stream start. Defer decoding until the amount of
+        * data we are about to skip is available again, but wait at most 60ms.
+        */
+       pmd->flags |= MP3DEC_FLAG_BAD_DATA;
+       pmd->input_len_barrier = len;
+       tv_add(now, &(struct timeval){0, 60 * 1000},
+               &pmd->stream_start_barrier);
+       return 1;
+ }
+ 
  static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
  {
        int i, ret;
@@@ -40,6 -93,8 +95,8 @@@
  
        if (fn->loaded + 16384 > fn->bufsize)
                return 0;
+       if (need_bad_data_delay(pmd, len))
+               return 0;
        mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
        pmd->stream.error = 0;
  next_frame:
@@@ -54,18 -109,18 +111,18 @@@
        fn->fc->samplerate = pmd->frame.header.samplerate;
        fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
        ret = mad_frame_decode(&pmd->frame, &pmd->stream);
-       if (ret) {
-               if (MAD_RECOVERABLE(pmd->stream.error) ||
-                       pmd->stream.error == MAD_ERROR_BUFLEN) {
-                       PARA_DEBUG_LOG("frame decode: %s\n",
-                               mad_stream_errorstr(&pmd->stream));
+       if (ret != 0) {
+               ret = handle_decode_error(pmd, len);
+               if (ret < 0)
+                       return ret;
+               if (ret == 0)
                        goto out;
-               }
-               PARA_ERROR_LOG("frame decode: %s\n",
-                       mad_stream_errorstr(&pmd->stream));
-               return -E_MAD_FRAME_DECODE;
+               ret = copy - (pmd->stream.bufend - pmd->stream.next_frame);
+               PARA_NOTICE_LOG("skipping %d input bytes\n", ret);
+               return ret;
        }
        mad_synth_frame(&pmd->synth, &pmd->frame);
+       pmd->flags |= MP3DEC_FLAG_DECODE_STARTED;
  
        for (i = 0; i < pmd->synth.pcm.length; i++) {
                int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);

diff --combined vss.c
index 21f4cb4de07706f53591b3e7161f8c22a570ff24,ccdd1f7c96323b0158892beb984e34ab33d4c8b1..269c0e0c4ac2d8ff1ed4c329db168fa26f869671
--- 1/vss.c
--- 2/vss.c
+++ b/vss.c
@@@ -11,9 -11,7 +11,9 @@@
   * senders.
   */
  
 +#include <regex.h>
  #include <dirent.h>
 +#include <osl.h>
  
  #include "para.h"
  #include "error.h"
@@@ -338,8 -336,6 +338,6 @@@ static int setup_next_fec_group(struct 
        /* setup group timing */
        tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp);
        tv_add(&fc->stream_start, &tmp, &g->start);
-       if (g->num) /* quick hack to avoid buffer underruns */
-               g->start.tv_sec--;
        tv_scale(g->num_chunks, chunk_tv, &tmp); /* group duration */
        tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
                &tmp, &g->slice_duration);
@@@ -488,7 -484,8 +486,7 @@@ static void compute_slice_timeout(struc
  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;
@@@ -630,6 -627,10 +628,6 @@@ static void vss_eof(struct vss_task *vs
        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++;
@@@ -778,6 -779,7 +776,6 @@@ static void recv_afs_result(struct vss_
        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;
@@@ -952,6 -954,7 +950,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;