From: Andre Noll <maan@systemlinux.org>
Date: Mon, 31 Aug 2009 19:37:03 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~32
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=8970261c6574f5a46941308ac68a17dc01bbd11f;hp=702d72b58b6378c4cdb37cbb709fd1d351571123

Merge branch 'master' into next

Conflicts:
	aft.c
	command.c
---

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index aceee9ae..bd2b4be6 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -22,6 +22,14 @@
 #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 +38,55 @@ struct private_mp3dec_data {
 	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 +95,8 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 
 	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 +111,18 @@ next_frame:
 	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 --git a/vss.c b/vss.c
index 21f4cb4d..269c0e0c 100644
--- a/vss.c
+++ b/vss.c
@@ -338,8 +338,6 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 	/* 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);