X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=fd8c9b28a8deed548be8e2344ca909c131dbf9b4;hp=78eaf0c58644a2c8a5688e76e06a77722668755c;hb=4567280e18c11f1f077b00421bca8e25d2dbab83;hpb=140f9c897ee0ae990a7c6125b660958a32feabbe

diff --git a/play.c b/play.c
index 78eaf0c5..fd8c9b28 100644
--- a/play.c
+++ b/play.c
@@ -22,10 +22,10 @@
  * based on the vplay program by Michael Beck.
  */
 
-#define BUFFER_SIZE 1000 * 1000
 #define WAV_HEADER_LEN 44
 #include <sys/time.h> /* gettimeofday */
 #include "para.h"
+#include "fd.h"
 #include "play.cmdline.h"
 #include <alsa/asoundlib.h>
 
@@ -67,6 +67,15 @@ static size_t bytes_per_frame;
 static struct timeval *start_time;
 static struct gengetopt_args_info conf;
 
+void para_log(__unused int ll, const char* fmt,...)
+{
+	va_list argp;
+
+	va_start(argp, fmt);
+	vfprintf(stderr, fmt, argp);
+	va_end(argp);
+}
+
 /*
  * read_wav_header - read WAV_HEADER_LEN bytes from stdin to audio buffer
  *
@@ -109,13 +118,13 @@ static void set_alsa_params(void)
 		EXIT(E_SAMPLE_FORMAT);
 	if (snd_pcm_hw_params_set_channels(handle, hwparams, conf.channels_arg) < 0)
 		EXIT(E_CHANNEL_COUNT);
-	if (snd_pcm_hw_params_set_rate_near(handle, hwparams, (unsigned int*) &conf.sample_rate_arg, 0) < 0)
+	if (snd_pcm_hw_params_set_rate_near(handle, hwparams,
+			(unsigned int*) &conf.sample_rate_arg, 0) < 0)
 		EXIT(E_SET_RATE);
 	err = snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time, 0);
 	if (err < 0 || !buffer_time)
 		EXIT(E_GET_BUFFER_TIME);
-	if (buffer_time > 500000)
-		buffer_time = 500000;
+	PARA_DEBUG_LOG("buffer time: %d\n", buffer_time);
 	if (snd_pcm_hw_params_set_buffer_time_near(handle, hwparams,
 			&buffer_time, 0) < 0)
 		EXIT(E_SET_BUFFER_TIME);
@@ -123,13 +132,14 @@ static void set_alsa_params(void)
 		EXIT(E_HW_PARAMS);
 	snd_pcm_hw_params_get_period_size(hwparams, &chunk_size, 0);
 	snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size);
+	PARA_DEBUG_LOG("buffer size: %lu, period_size: %lu\n", buffer_size, chunk_size);
 	if (chunk_size == buffer_size)
 		EXIT(E_BAD_PERIOD);
 	snd_pcm_sw_params_current(handle, swparams);
 	err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
 	if (err < 0 || !xfer_align)
 		EXIT(E_GET_XFER);
-	snd_pcm_sw_params_set_sleep_min(handle, swparams, 0);
+//	snd_pcm_sw_params_set_sleep_min(handle, swparams, 0);
 	snd_pcm_sw_params_set_avail_min(handle, swparams, chunk_size);
 	/* round to closest transfer boundary */
 	start_threshold = (buffer_size / xfer_align) * xfer_align;
@@ -163,7 +173,7 @@ static snd_pcm_sframes_t pcm_write(u_char *data, size_t count)
 		/* write interleaved frames */
 		r = snd_pcm_writei(handle, data, count);
 		if (r < 0)
-			fprintf(stderr, "write error: %s\n", snd_strerror(r));
+			PARA_ERROR_LOG("write error: %s\n", snd_strerror(r));
 		if (r == -EAGAIN || (r >= 0 && r < count))
 			snd_pcm_wait(handle, 1);
 		else if (r == -EPIPE)
@@ -209,9 +219,8 @@ static int start_time_in_future(struct timeval *diff)
  */
 static void do_initial_delay(struct timeval *delay)
 {
-	fprintf(stderr, "sleeping %lums\n", tv2ms(delay));
 	do
-		select(1, NULL, NULL, NULL, delay);
+		para_select(1, NULL, NULL, delay);
 	while (start_time_in_future(delay));
 }
 
@@ -225,41 +234,38 @@ static void do_initial_delay(struct timeval *delay)
  */
 static void play_pcm(size_t loaded)
 {
-	size_t chunk_bytes, bufsize, written = 0;
+	size_t chunk_bytes, bufsize, written = 0, prebuf_size;
 	ssize_t ret;
 	unsigned char *p;
-	int dont_write;
 	struct timeval delay;
 
 	set_alsa_params();
 	chunk_bytes = chunk_size * bytes_per_frame;
-	bufsize = chunk_bytes * 1024;
+	bufsize = (conf.bufsize_arg * 1024 / chunk_bytes) * chunk_bytes;
 	audiobuf = realloc(audiobuf, bufsize);
 	if (!audiobuf)
 		EXIT(E_MEM);
+	prebuf_size = conf.prebuffer_arg * bufsize / 100;
 again:
-	dont_write = 0;
-	if (!written && start_time)
-		dont_write = start_time_in_future(&delay);
-	if (!dont_write) {
-		p = audiobuf;
-		while (loaded >= chunk_bytes) {
-			ret = pcm_write(p, chunk_size) * bytes_per_frame;
-			p += ret;
-			written += ret;
-			loaded -= ret;
-		}
-		if (loaded && p != audiobuf) {
-			fprintf(stderr, "memcpy: %d\n", loaded);
-			memcpy(audiobuf, p, loaded);
+	if (!written) {
+		if (loaded < prebuf_size)
+			goto read;
+		if (start_time && start_time_in_future(&delay)) {
+			do_initial_delay(&delay);
+			start_time = NULL;
 		}
 	}
-	if (dont_write && loaded >= bufsize) {
-		do_initial_delay(&delay);
-		start_time = NULL;
-		goto again;
+	p = audiobuf;
+	while (loaded >= chunk_bytes) {
+		ret = pcm_write(p, chunk_size) * bytes_per_frame;
+		p += ret;
+		written += ret;
+		loaded -= ret;
 	}
-	ret = read(STDIN_FILENO, audiobuf, bufsize - loaded);
+	if (loaded && p != audiobuf)
+		memcpy(audiobuf, p, loaded);
+read:
+	ret = read(STDIN_FILENO, audiobuf + loaded, bufsize - loaded);
 	if (ret < 0)
 		EXIT(E_READ);
 	if (ret) {
@@ -282,8 +288,6 @@ static size_t check_wave(void)
 		return WAV_HEADER_LEN;
 	conf.channels_arg = (unsigned) a[22];
 	conf.sample_rate_arg = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-//	fprintf(stderr, "channels: %d, rate: %d\n", conf.channels_arg,
-//		conf.sample_rate_arg);
 	return 0;
 }
 
@@ -301,7 +305,6 @@ int main(int argc, char *argv[])
 			EXIT(E_SYNTAX);
 		start_time = &tv;
 	}
-//	fprintf(stderr, "argc=%d, argv[1]=%s\n",argc,  argv[1]);
 	snd_pcm_info_alloca(&info);
 	if (snd_output_stdio_attach(&log, stderr, 0) < 0)
 		EXIT(E_LOG);