X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=8e70750511381b425c33f0c7cf8237dc1a47af16;hp=8e1e6b31960a6f3fd7da8d8f7b7cf9b0cf73475c;hb=6bcd10bc4ada11a04bc2b7425afe5a8855592cd2;hpb=7cb521f3eeb7fda02344c523989d5903251e673e diff --git a/afh.c b/afh.c index 8e1e6b31..8e707505 100644 --- a/afh.c +++ b/afh.c @@ -1,13 +1,12 @@ /* - * Copyright (C) 2008-2009 Andre Noll + * Copyright (C) 2008-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file afh.c Paraslash's standalone audio format handler tool. */ -#include -#include +#include #include "para.h" #include "string.h" @@ -15,11 +14,10 @@ #include "fd.h" #include "afh.h" #include "error.h" +#include "version.h" +#include "ggo.h" static struct afh_args_info conf; -/** The list of all status items */ -const char *status_item_list[] = {STATUS_ITEM_ARRAY}; - INIT_AFH_ERRLISTS; static int loglevel; @@ -27,101 +25,47 @@ INIT_STDERR_LOGGING(loglevel) 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 - ); + char *msg; + + afh_get_afhi_txt(audio_format_num, afhi, &msg); + printf("%s", msg); + free(msg); } 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"); + if (conf.parser_friendly_given) { + printf("chunk_table: "); + for (i = 0; i <= afhi->chunks_total; i++) + printf("%u ", afhi->chunk_table[i]); + printf("\n"); + return; + } + for (i = 1; i <= afhi->chunks_total; i++) { + struct timeval tv; + long unsigned from, to; + tv_scale(i - 1, &afhi->chunk_tv, &tv); + from = tv2ms(&tv); + tv_scale(i, &afhi->chunk_tv, &tv); + to = tv2ms(&tv); + printf("%d [%lu.%03lu - %lu.%03lu] %u - %u (%u)\n", i - 1, + from / 1000, from % 1000, to / 1000, to % 1000, + afhi->chunk_table[i - 1], afhi->chunk_table[i], + afhi->chunk_table[i] - afhi->chunk_table[i - 1]); + } } -static int cat_file(void *audio_file_data, struct afh_info *afhi) +__noreturn static void print_help_and_die(void) { - int ret; - struct timeval stream_start; - long unsigned i, first_chunk, last_chunk; - const char *buf; - size_t size; - + struct ggo_help h = DEFINE_GGO_HELP(afh); + int d = conf.detailed_help_given; + unsigned flags = d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS; - 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; - } - } - if (!size) - continue; - PARA_INFO_LOG("writing chunk %lu\n", i); - ret = write_all(STDOUT_FILENO, buf, &size); - if (ret < 0) - return ret; - } - return 1; + ggo_print_help(&h, flags); + printf("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS); + exit(EXIT_SUCCESS); } /** @@ -140,36 +84,34 @@ int main(int argc, char **argv) struct afh_info afhi; afh_cmdline_parser(argc, argv, &conf); - HANDLE_VERSION_FLAG("afh", conf); loglevel = get_loglevel_by_name(conf.loglevel_arg); + version_handle_flag("afh", conf.version_given); + if (conf.help_given || conf.detailed_help_given) + print_help_and_die(); + afh_init(); ret = -E_AFH_SYNTAX; if (conf.inputs_num == 0) goto out; - if (conf.stream_given && conf.inputs_num != 1) - goto out; - afh_init(); for (i = 0; i < conf.inputs_num; i++) { int ret2; ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data, &audio_file_size, &fd); - if (ret < 0) + if (ret < 0) { + PARA_ERROR_LOG("failed to mmap \"%s\"\n", conf.inputs[i]); goto out; + } ret = compute_afhi(conf.inputs[i], audio_file_data, audio_file_size, fd, &afhi); if (ret < 0) goto out; + audio_format_num = ret; - if (conf.stream_given) - ret = cat_file(audio_file_data, &afhi); - else { - printf("File %d: %s\n", i + 1, conf.inputs[i]); - print_info(audio_format_num, &afhi); - if (conf.chunk_table_given) - print_chunk_table(&afhi); - printf("\n"); - } - free(afhi.chunk_table); - free(afhi.info_string); + printf("File %d: %s\n", i + 1, conf.inputs[i]); + print_info(audio_format_num, &afhi); + if (conf.chunk_table_given) + print_chunk_table(&afhi); + printf("\n"); + clear_afhi(&afhi); ret2 = para_munmap(audio_file_data, audio_file_size); if (ret2 < 0 && ret >= 0) ret = ret2;