X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=dd69d9e458d73ff9fbd9735f590b54a3b999922f;hp=84a061b9288f040a3b1a7d644565f17e8be90a97;hb=a98d8715828261927da6705321a8b1a31d23c6d4;hpb=80e46ec589d14be2fa4b0704f613a04ecb1b64c4

diff --git a/afh.c b/afh.c
index 84a061b9..dd69d9e4 100644
--- a/afh.c
+++ b/afh.c
@@ -7,6 +7,7 @@
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <dirent.h>
+#include <sys/time.h>
 
 #include "para.h"
 #include "string.h"
@@ -22,9 +23,106 @@ const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 INIT_AFH_ERRLISTS;
 INIT_STDERR_LOGGING(conf.loglevel_arg)
 
+static void print_info(int audio_format_num, struct afh_info *afhi)
+{
+	printf("%s: %dkbit/s\n" /* bitrate */
+		"%s: %s\n" /* format */
+		"%s: %dHz\n" /* frequency */
+		"%s: %d\n" /* channels */
+		"%s: %lu\n" /* seconds total */
+		"%s" /* tag info */
+		"%s: %lu: %lu\n" /* chunk time */
+		"%s: %lu\n", /* num chunks */
+		status_item_list[SI_BITRATE], afhi->bitrate,
+		status_item_list[SI_FORMAT], audio_format_name(audio_format_num),
+		status_item_list[SI_FREQUENCY], afhi->frequency,
+		status_item_list[SI_CHANNELS], afhi->channels,
+		status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total,
+		afhi->info_string,
+		status_item_list[SI_CHUNK_TIME], (long unsigned)afhi->chunk_tv.tv_sec,
+			(long unsigned)afhi->chunk_tv.tv_usec,
+		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total
+	);
+}
+
+static void print_chunk_table(struct afh_info *afhi)
+{
+	int i;
+
+	printf("chunk_table: ");
+	for (i = 0; i <= afhi->chunks_total; i++)
+		printf("%u ", afhi->chunk_table[i]);
+	printf("\n");
+}
+
+static int cat_file(void *audio_file_data, struct afh_info *afhi)
+{
+	int ret;
+	struct timeval stream_start;
+	long unsigned i, first_chunk, last_chunk;
+	char *buf;
+	size_t size;
+
+
+	if (conf.begin_chunk_arg < 0) {
+		if (-conf.begin_chunk_arg > afhi->chunks_total)
+			return -ERRNO_TO_PARA_ERROR(EINVAL);
+		first_chunk = afhi->chunks_total + conf.begin_chunk_arg;
+	} else
+		first_chunk = conf.begin_chunk_arg;
+	if (conf.end_chunk_given) {
+		if (conf.end_chunk_arg < 0) {
+			if (-conf.end_chunk_arg > afhi->chunks_total)
+				return -ERRNO_TO_PARA_ERROR(EINVAL);
+			last_chunk = afhi->chunks_total + conf.end_chunk_arg;
+		} else {
+			if (conf.end_chunk_arg >= afhi->chunks_total)
+				return -ERRNO_TO_PARA_ERROR(EINVAL);
+			last_chunk = conf.end_chunk_arg;
+		}
+	} else
+		last_chunk = afhi->chunks_total - 1;
+	if (first_chunk >= last_chunk)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	if (!afhi->chunks_total)
+		return 1;
+	afh_get_header(afhi, audio_file_data, &buf, &size);
+	if (size && first_chunk && !conf.no_header_given) {
+		PARA_INFO_LOG("writing audio file header (%zu bytes)\n", size);
+		ret = write(STDOUT_FILENO, buf, size);
+		if (ret < 0)
+			return ret;
+		if (ret != size)
+			return -E_AFH_SHORT_WRITE;
+	}
+	PARA_NOTICE_LOG("writing chunks %lu - %lu\n", first_chunk, last_chunk);
+	gettimeofday(&stream_start, NULL);
+	for (i = first_chunk; i <= last_chunk; i++) {
+		struct timeval now, diff, next_chunk;
+		afh_get_chunk(i, afhi, audio_file_data, &buf, &size);
+		PARA_DEBUG_LOG("chunk %lu: size %zu\n", i, size);
+		if (conf.just_in_time_given) {
+			compute_chunk_time(i - first_chunk, &afhi->chunk_tv,
+				&stream_start, &next_chunk);
+			gettimeofday(&now, NULL);
+			ret = tv_diff(&next_chunk, &now, &diff);
+			if (ret > 0) {
+				ret = para_select(1, NULL, NULL, &diff);
+				if (ret < 0)
+					return ret;
+			}
+		}
+		PARA_INFO_LOG("writing chunk %lu\n", i);
+		ret = write_all(STDOUT_FILENO, buf, &size);
+		if (ret < 0)
+			return ret;
+	}
+	return 1;
+}
+
 int main(int argc, char **argv)
 {
-	int i, ret;
+	int ret, audio_format_num;
 	void *audio_file_data;
 	size_t audio_file_size;
 	struct afh_info afhi;
@@ -42,32 +140,15 @@ int main(int argc, char **argv)
 	ret = compute_afhi(conf.inputs[0], audio_file_data, audio_file_size, &afhi);
 	if (ret < 0)
 		goto out;
-	printf("%s: %dkbit/s\n" /* bitrate */
-		"%s: %s\n" /* format */
-		"%s: %dHz\n" /* frequency */
-		"%s: %d\n" /* channels */
-		"%s: %lu\n" /* seconds total */
-		"%s" /* tag info */
-		"%s: %lu: %lu\n" /* chunk time */
-		"%s: %lu\n", /* num chunks */
-		status_item_list[SI_BITRATE], afhi.bitrate,
-		status_item_list[SI_FORMAT], audio_format_name(ret),
-		status_item_list[SI_FREQUENCY], afhi.frequency,
-		status_item_list[SI_CHANNELS], afhi.channels,
-		status_item_list[SI_SECONDS_TOTAL], afhi.seconds_total,
-		afhi.info_string,
-		status_item_list[SI_CHUNK_TIME], (long unsigned)afhi.chunk_tv.tv_sec,
-			(long unsigned)afhi.chunk_tv.tv_usec,
-		status_item_list[SI_NUM_CHUNKS], afhi.chunks_total
-	);
-	ret = 1;
-	if (!conf.chunk_table_given)
-		goto out;
-	printf("chunk_table: ");
-	for (i = 0; i <= afhi.chunks_total; i++)
-		printf("%u ", afhi.chunk_table[i]);
-	printf("\n");
-	ret = 1;
+	audio_format_num = ret;
+	if (conf.stream_given)
+		ret = cat_file(audio_file_data, &afhi);
+	else {
+		print_info(audio_format_num, &afhi);
+		if (conf.chunk_table_given)
+			print_chunk_table(&afhi);
+		ret = 1;
+	}
 out:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));